git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #86230 from prusnak/electron-cleanup

electron_3: refactor

commit9ed9140cc6c1bffd2af090989bab144689f2cd41 authorMarek Mahut <marek.mahut@gmail.com> dateSun 7 Jun 2020, 20:07 (6 years ago) parent148bf838247dc8
4 files changed+24−115
pkgs/applications/misc/obinskit/default.nix+15−35 pkgs/development/tools/electron/3.x.nix−77 pkgs/development/tools/electron/default.nix+8 pkgs/top-level/all-packages.nix+1−3
pkgs/applications/misc/obinskit/default.nix+15−35
@@ -1,33 +1,24 @@
1−{ lib
2−, stdenv
1+{ stdenv
32, fetchurl
4−, xorg
53, libxkbcommon
64, systemd
7−, gcc-unwrapped
5+, xorg
86, electron_3
9−, wrapGAppsHook
7+, makeWrapper
108, makeDesktopItem
119}:
12−
1310let
14− libPath = lib.makeLibraryPath [
15− libxkbcommon
16− xorg.libXt
17− systemd.lib
18− stdenv.cc.cc.lib
19− ];
20−
2111 desktopItem = makeDesktopItem rec {
2212 name = "Obinskit";
2313 exec = "obinskit";
24− icon = "obinskit.png";
14+ icon = "obinskit";
2515 desktopName = "Obinskit";
2616 genericName = "Obinskit keyboard configurator";
2717 categories = "Utility";
2818 };
2919
30−in stdenv.mkDerivation rec {
20+in
21+stdenv.mkDerivation rec {
3122 pname = "obinskit";
3223 version = "1.1.4";
3324
@@ -40,44 +31,33 @@ in stdenv.mkDerivation rec {
4031
4132 sourceRoot = "ObinsKit_${version}_x64";
4233
43− nativeBuildInputs = [ wrapGAppsHook ];
34+ nativeBuildInputs = [ makeWrapper ];
4435
4536 dontConfigure = true;
4637 dontBuild = true;
4738
4839 installPhase = ''
4940 mkdir -p $out/opt/obinskit
50− install icudtl.dat $out/opt/obinskit/
51− install natives_blob.bin $out/opt/obinskit/
52− install v8_context_snapshot.bin $out/opt/obinskit/
53− install blink_image_resources_200_percent.pak $out/opt/obinskit/
54− install content_resources_200_percent.pak $out/opt/obinskit/
55− install content_shell.pak $out/opt/obinskit/
56− install ui_resources_200_percent.pak $out/opt/obinskit/
57− install views_resources_200_percent.pak $out/opt/obinskit/
41+
5842 cp -r resources $out/opt/obinskit/
5943 cp -r locales $out/opt/obinskit/
6044
61− mkdir -p $out/bin
62− ln -s ${electron_3}/bin/electron $out/bin/obinskit
63−
6445 mkdir -p $out/share/{applications,pixmaps}
6546 install resources/icons/tray-darwin@2x.png $out/share/pixmaps/obinskit.png
6647 ln -s ${desktopItem}/share/applications/* $out/share/applications
6748 '';
6849
69− preFixup = ''
70− gappsWrapperArgs+=(
71− --add-flags $out/opt/obinskit/resources/app.asar
72− --prefix LD_LIBRARY_PATH : "${libPath}"
73− )
50+ postFixup = ''
51+ makeWrapper ${electron_3}/bin/electron $out/bin/${pname} \
52+ --add-flags $out/opt/obinskit/resources/app.asar \
53+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}"
7454 '';
7555
76− meta = with lib; {
56+ meta = with stdenv.lib; {
7757 description = "Graphical configurator for Anne Pro and Anne Pro II keyboards";
78− homepage = "http://en.obins.net/obinskit/";
58+ homepage = "http://en.obins.net/obinskit/"; # https is broken
7959 license = licenses.unfree;
80− maintainers = [ maintainers.shou ];
60+ maintainers = with maintainers; [ shou ];
8161 platforms = [ "x86_64-linux" ];
8262 };
8363}
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
@@ -9989,9 +9989,7 @@ in
99899989 aws-adfs = with python3Packages; toPythonApplication aws-adfs;
99909990
99919991 inherit (callPackages ../development/tools/electron { })
9992− electron_4 electron_5 electron_6 electron_7 electron_8 electron_9;
9993−
9994− electron_3 = callPackage ../development/tools/electron/3.x.nix { };
9992+ electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9;
99959993 electron = electron_4;
99969994
99979995 autobuild = callPackage ../development/tools/misc/autobuild { };