pyrox.dev / nixpkgs
lol
fork atom

electron-bin: remove atomEnv

Sandro Jäckel 5d5e71a3 d1b31aab

+43 -14
unified split
+43 -14
pkgs/development/tools/electron/binary/generic.nix
··· 1 - { lib, stdenv 2 , libXScrnSaver 3 , makeWrapper 4 , fetchurl ··· 6 , glib 7 , gtk3 8 , unzip 9 - , atomEnv 10 - , libuuid 11 , at-spi2-atk 12 - , at-spi2-core 13 , libdrm 14 , mesa 15 , libxkbcommon 16 - , libappindicator-gtk3 17 , libxshmfence 18 , libglvnd 19 - , wayland 20 }: 21 22 version: hashes: ··· 64 passthru.headers = headersFetcher version hashes.headers; 65 }; 66 67 - electronLibPath = with lib; makeLibraryPath ( 68 - [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 wayland ] 69 - ++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ] 70 - ++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ] 71 - ++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ] 72 - ++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ] 73 - ++ optionals (versionAtLeast version "17.0.0") [ libglvnd ] 74 ); 75 76 linux = { ··· 95 postFixup = '' 96 patchelf \ 97 --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 98 - --set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/libexec/electron" \ 99 $out/libexec/electron/.electron-wrapped \ 100 ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" } 101 '';
··· 1 + { lib 2 + , stdenv 3 , libXScrnSaver 4 , makeWrapper 5 , fetchurl ··· 7 , glib 8 , gtk3 9 , unzip 10 , at-spi2-atk 11 , libdrm 12 , mesa 13 , libxkbcommon 14 , libxshmfence 15 , libglvnd 16 + , alsa-lib 17 + , cairo 18 + , cups 19 + , dbus 20 + , expat 21 + , gdk-pixbuf 22 + , nss 23 + , nspr 24 + , xorg 25 + , pango 26 + , systemd 27 }: 28 29 version: hashes: ··· 71 passthru.headers = headersFetcher version hashes.headers; 72 }; 73 74 + electronLibPath = lib.makeLibraryPath ([ 75 + alsa-lib 76 + at-spi2-atk 77 + cairo 78 + cups 79 + dbus 80 + expat 81 + gdk-pixbuf 82 + glib 83 + gtk3 84 + nss 85 + nspr 86 + xorg.libX11 87 + xorg.libxcb 88 + xorg.libXcomposite 89 + xorg.libXdamage 90 + xorg.libXext 91 + xorg.libXfixes 92 + xorg.libXrandr 93 + xorg.libxkbfile 94 + pango 95 + stdenv.cc.cc.lib 96 + systemd 97 + ] 98 + ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ] 99 + ++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ] 100 + ++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ] 101 + ++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ] 102 + ++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libglvnd ] 103 ); 104 105 linux = { ··· 124 postFixup = '' 125 patchelf \ 126 --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 127 + --set-rpath "${electronLibPath}:$out/libexec/electron" \ 128 $out/libexec/electron/.electron-wrapped \ 129 ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" } 130 '';