TredwellGit 3 years ago
parent 6b746880b9
commit a8fde9c824
  1. 12
      pkgs/development/tools/electron/default.nix
  2. 2
      pkgs/development/tools/electron/generic.nix
  3. 2
      pkgs/top-level/all-packages.nix

@ -14,6 +14,7 @@
, mesa
, libxkbcommon
, libappindicator-gtk3
, libxshmfence
}@args:
let
@ -21,7 +22,7 @@ let
in
rec {
electron = electron_11;
electron = electron_12;
electron_3 = mkElectron "3.1.13" {
x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
@ -102,4 +103,13 @@ rec {
aarch64-linux = "fad31c6fba7aba54db19a2aaedb03b514c51dd58bf301afab5265126833feb15";
headers = "123g3dgsb4vp8w1bm4apbp973ppzx4i4y35lhhmqjbp51jhrm9f0";
};
electron_12 = mkElectron "12.0.0" {
x86_64-linux = "d132a80e08500e783e36a25cb72bc2555ec388798326c22348e3d9ff57fa91f1";
x86_64-darwin = "18546dec0ecc63d1a679762e00bc85fbb820e08f7ca205924681379bb0a7afc2";
i686-linux = "79651836e857f8c860c6ad053346f7e2cf38351160845687b199faba113b9483";
armv7l-linux = "e98eb2df69f240806e283018d4e0349a45b4cb5b6635d1e1c11d869e50cc60cb";
aarch64-linux = "ea26777ffea5e788bb708814c8707e8ac3529146e7738729aa8bd49d0d74bcd1";
headers = "0h7mkz7wmcf0jq8gmq21ag2ax5ivy2wlz0ykw7rv2r4l5686xdjr";
};
}

@ -14,6 +14,7 @@
, mesa
, libxkbcommon
, libappindicator-gtk3
, libxshmfence
}:
version: hashes:
@ -60,6 +61,7 @@ let
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
++ optionals (! versionOlder version "12.0.0") [ libxshmfence ]
);
linux = {

@ -11850,7 +11850,7 @@ in
aws-adfs = with python3Packages; toPythonApplication aws-adfs;
inherit (callPackages ../development/tools/electron { })
electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11;
electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11 electron_12;
autobuild = callPackage ../development/tools/misc/autobuild { };

Loading…
Cancel
Save