diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2020-05-21 19:41:22 +0200 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2020-05-22 09:55:55 +0200 |
| commit | 0045730c57d7d705dcc568c6e420dc6a226d1266 (patch) | |
| tree | 45eb2a04ca49297baa63daae5624990630517c1c /pkgs/development/tools | |
| parent | 6a205d6cb4665040c8c533a9fcd940fb18648063 (diff) | |
| download | nixlib-0045730c57d7d705dcc568c6e420dc6a226d1266.tar nixlib-0045730c57d7d705dcc568c6e420dc6a226d1266.tar.gz nixlib-0045730c57d7d705dcc568c6e420dc6a226d1266.tar.bz2 nixlib-0045730c57d7d705dcc568c6e420dc6a226d1266.tar.lz nixlib-0045730c57d7d705dcc568c6e420dc6a226d1266.tar.xz nixlib-0045730c57d7d705dcc568c6e420dc6a226d1266.tar.zst nixlib-0045730c57d7d705dcc568c6e420dc6a226d1266.zip | |
electron_9: init at 9.0.0
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/electron/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/tools/electron/generic.nix | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 3d0c9afd33e9..9ed0d27894e3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -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 mkElectron = import ./generic.nix args; @@ -43,4 +43,12 @@ in armv7l-linux = "14b67e8a41ce8882442816a2db0eee69fac141e359911704002beb7063aa0eff"; 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"; + }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index d5d257ae6444..04b610dde1c5 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -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: let @@ -33,6 +33,8 @@ let 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 = { buildInputs = [ glib gtk3 ]; @@ -56,7 +58,7 @@ let postFixup = '' patchelf \ --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 wrapProgram $out/lib/electron/electron \ |