public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88551 from prusnak/electron-9

Browse Source 
electron_9: init at 9.0.0
This commit is contained in:
Marek Mahut 2020-06-02 09:54:56 +02:00 committed by GitHub
commit 3b2c06909e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/electron/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }@args: { stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }@args:
let let
mkElectron = import ./generic.nix args; mkElectron = import ./generic.nix args;
@ -43,4 +43,12 @@ in
armv7l-linux = "14b67e8a41ce8882442816a2db0eee69fac141e359911704002beb7063aa0eff"; armv7l-linux = "14b67e8a41ce8882442816a2db0eee69fac141e359911704002beb7063aa0eff";
aarch64-linux = "1d89a75fff3b690efe1295fe6f91225c4fa64f3c22c6acddec895d54e1040b4d"; aarch64-linux = "1d89a75fff3b690efe1295fe6f91225c4fa64f3c22c6acddec895d54e1040b4d";
}; };
electron_9 = mkElectron "9.0.0" {
x86_64-linux = "03c69d66ae8784edcc6a4b8081eb4e07da802035a6257fb6e2260a456371224f";
x86_64-darwin = "86096d2ecff0698957bfbbe8a8d56c7f9ed9abe7e5a5bfe84a8f4af0635625e1";
i686-linux = "67ea9e04db5a709b10d2f101d977e803b5f5da9e9573cbcc7bce362b1a9406d7";
armv7l-linux = "7917624b81318197da52de04073e07c4b2d3947737d4103f647a8abc907600c0";
aarch64-linux = "e3dd2e15cfd346a59c69ff4b0b234daf5bb06790b508ae0056a55c17eef78a9e";
};
} }

6
pkgs/development/tools/electron/generic.nix
View File

@ -1,4 +1,4 @@
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: { stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }:
version: hashes: version: hashes:
let let
@ -33,6 +33,8 @@ let
src = fetcher version (get tags platform) (get hashes platform); src = fetcher version (get tags platform) (get hashes platform);
}; };
electronLibPath = stdenv.lib.makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ stdenv.lib.optionals (version > "9") [ libdrm mesa ]);
linux = { linux = {
buildInputs = [ glib gtk3 ]; buildInputs = [ glib gtk3 ];
@ -56,7 +58,7 @@ let
postFixup = '' postFixup = ''
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \ --set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/lib/electron" \
$out/lib/electron/electron $out/lib/electron/electron
wrapProgram $out/lib/electron/electron \ wrapProgram $out/lib/electron/electron \

2
pkgs/top-level/all-packages.nix
View File

@ -10002,7 +10002,7 @@ in
aws-adfs = with python3Packages; toPythonApplication aws-adfs; aws-adfs = with python3Packages; toPythonApplication aws-adfs;
inherit (callPackages ../development/tools/electron { }) inherit (callPackages ../development/tools/electron { })
electron_4 electron_5 electron_6 electron_7 electron_8; electron_4 electron_5 electron_6 electron_7 electron_8 electron_9;
electron_3 = callPackage ../development/tools/electron/3.x.nix { }; electron_3 = callPackage ../development/tools/electron/3.x.nix { };
electron = electron_4; electron = electron_4;