mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Code Issues Wiki Activity

electron_11: init at 11.0.2

Browse source 
make electron point to electron_11
This commit is contained in:
Pavol Rusnak 2020-11-17 16:03:53 +01:00
parent 0c93e10509
commit 8cde963967
No known key found for this signature in database
GPG key ID: 91F3B339B9A02A3D
3 changed files with 47 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/tools/electron/default.nix
View file

@ -1,11 +1,26 @@
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }@args:
{ stdenv
, libXScrnSaver
, makeWrapper
, fetchurl
, wrapGAppsHook
, glib
, gtk3
, unzip
, atomEnv
, libuuid
, at-spi2-atk
, at-spi2-core
, libdrm
, mesa
, libxkbcommon
}@args:
let
mkElectron = import ./generic.nix args;
in
rec {
electron = electron_10;
electron = electron_11;
electron_3 = mkElectron "3.1.13" {
x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
@ -70,4 +85,12 @@ rec {
armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951";
aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da";
};
electron_11 = mkElectron "11.0.2" {
x86_64-linux = "a6e4f789d99e2ed879b48e7cbca2051805c3727360074edfe903231756eb5636";
x86_64-darwin = "4a562646440c3f4fa1ec4bbdb238da420158e19f294a0fbcdf32004465dbd516";
i686-linux = "ffcb2e40f98ee521ac50aa849cd911e62dae8a610bcca3f6d393b3f8d9bb85d8";
armv7l-linux = "7552f0c2aad05844ceacaaf13588b06b16e9aadd947084e8249214b24d1da38d";
aarch64-linux = "56b5ae4a33a9aa666fbe1463c7780d4c737c84119eff77d403fb969e8ff90ce0";
};
}

23
pkgs/development/tools/electron/generic.nix
View file

@ -1,4 +1,19 @@
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }:
{ stdenv
, libXScrnSaver
, makeWrapper
, fetchurl
, wrapGAppsHook
, glib
, gtk3
, unzip
, atomEnv
, libuuid
, at-spi2-atk
, at-spi2-core
, libdrm
, mesa
, libxkbcommon
}:
version: hashes:
let
@ -34,7 +49,11 @@ let
src = fetcher version (get tags platform) (get hashes platform);
};
electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]);
electronLibPath = with stdenv.lib; makeLibraryPath (
[ libuuid at-spi2-atk at-spi2-core ]
++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
);
linux = {
buildInputs = [ glib gtk3 ];

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

@ -10804,7 +10804,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 electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11;
autobuild = callPackage ../development/tools/misc/autobuild { };