git.iko.soy/typeable/nixpkgs
on master help sign in
electron_3: refactor, so we can use electron/default.nix

for electron 3.x too

commit6e41b08e7ab7d28f68e7e9ee05f26c0d459821f4 authorPavol Rusnak <pavol@rusnak.io> dateTue 2 Jun 2020, 11:21 (6 years ago) parent00df237
3 files changed+9−80
pkgs/development/tools/electron/3.x.nix−77 pkgs/development/tools/electron/default.nix+8 pkgs/top-level/all-packages.nix+1−3
pkgs/development/tools/electron/3.x.nixdeleted−77
@@ -1,77 +0,0 @@
1−{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }:
2−
3−let
4− version = "3.1.13";
5− name = "electron-${version}";
6−
7− throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
8−
9− meta = with stdenv.lib; {
10− description = "Cross platform desktop application shell";
11− homepage = "https://github.com/electron/electron";
12− license = licenses.mit;
13− maintainers = with maintainers; [ travisbhartwell manveru ];
14− platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ];
15− };
16−
17− linux = {
18− inherit name version meta;
19− src = {
20− i686-linux = fetchurl {
21− url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
22− sha256 = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23";
23− };
24− x86_64-linux = fetchurl {
25− url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
26− sha256 = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
27− };
28− armv7l-linux = fetchurl {
29− url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
30− sha256 = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa";
31− };
32− aarch64-linux = fetchurl {
33− url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
34− sha256 = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8";
35− };
36− }.${stdenv.hostPlatform.system} or throwSystem;
37−
38− buildInputs = [ unzip makeWrapper ];
39−
40− buildCommand = ''
41− mkdir -p $out/lib/electron $out/bin
42− unzip -d $out/lib/electron $src
43− ln -s $out/lib/electron/electron $out/bin
44−
45− fixupPhase
46−
47− patchelf \
48− --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
49− --set-rpath "${atomEnv.libPath}:${gtk2}/lib:${at-spi2-atk}/lib:$out/lib/electron" \
50− $out/lib/electron/electron
51−
52− wrapProgram $out/lib/electron/electron \
53− --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
54− '';
55− };
56−
57− darwin = {
58− inherit name version meta;
59−
60− src = fetchurl {
61− url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
62− sha256 = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx";
63− };
64−
65− buildInputs = [ unzip ];
66−
67− buildCommand = ''
68− mkdir -p $out/Applications
69− unzip $src
70− mv Electron.app $out/Applications
71− mkdir -p $out/bin
72− ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
73− '';
74− };
75−in
76−
77− stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux)
pkgs/development/tools/electron/default.nix+8
@@ -4,6 +4,14 @@ let
44 mkElectron = import ./generic.nix args;
55in
66{
7+ electron_3 = mkElectron "3.1.13" {
8+ x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
9+ x86_64-darwin = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx";
10+ i686-linux = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23";
11+ armv7l-linux = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa";
12+ aarch64-linux = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8";
13+ };
14+
715 electron_4 = mkElectron "4.2.12" {
816 x86_64-linux = "72c5319c92baa7101bea3254a036c0cd3bcf257f4a03a0bb153668b7292ee2dd";
917 x86_64-darwin = "89b0e16bb9b7072ed7ed1906fccd08540acdd9f42dd8a29c97fa17d811b8c5e5";
pkgs/top-level/all-packages.nix+1−3
@@ -10004,9 +10004,7 @@ in
1000410004 aws-adfs = with python3Packages; toPythonApplication aws-adfs;
1000510005
1000610006 inherit (callPackages ../development/tools/electron { })
10007− electron_4 electron_5 electron_6 electron_7 electron_8 electron_9;
10008−
10009− electron_3 = callPackage ../development/tools/electron/3.x.nix { };
10007+ electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9;
1001010008 electron = electron_4;
1001110009
1001210010 autobuild = callPackage ../development/tools/misc/autobuild { };