Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #258440 from SuperSandro2000/drop-atom

atom*: drop

authored by Pierre Bourdon and committed by GitHub e5f6200d 042d50a9

+273 -261
-96
pkgs/applications/editors/atom/default.nix
··· 1 - { lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }: 2 - 3 - let 4 - versions = { 5 - atom = { 6 - version = "1.60.0"; 7 - sha256 = "sha256-XHwCWQYrnUkR0lN7/Or/Uxb53hEWmIQKkNfNSX34kaY="; 8 - }; 9 - 10 - atom-beta = { 11 - version = "1.61.0"; 12 - beta = 0; 13 - sha256 = "sha256-viY/is7Nh3tlIkHhUBWtgMAjD6HDiC0pyJpUjsP5pRY="; 14 - broken = true; 15 - }; 16 - }; 17 - 18 - common = pname: {version, sha256, beta ? null, broken ? false}: 19 - let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; 20 - name = "${pname}-${fullVersion}"; 21 - in stdenv.mkDerivation { 22 - inherit name; 23 - version = fullVersion; 24 - 25 - src = fetchurl { 26 - url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb"; 27 - name = "${name}.deb"; 28 - inherit sha256; 29 - }; 30 - 31 - nativeBuildInputs = [ 32 - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system 33 - ]; 34 - 35 - buildInputs = [ 36 - gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed 37 - ]; 38 - 39 - dontBuild = true; 40 - dontConfigure = true; 41 - 42 - unpackPhase = '' 43 - ar p $src data.tar.xz | tar xJ ./usr/ 44 - ''; 45 - 46 - installPhase = '' 47 - runHook preInstall 48 - 49 - mkdir -p $out 50 - mv usr/bin usr/share $out 51 - rm -rf $out/share/lintian 52 - 53 - runHook postInstall 54 - ''; 55 - 56 - preFixup = '' 57 - gappsWrapperArgs+=( 58 - # needed for gio executable to be able to delete files 59 - --prefix "PATH" : "${glib.bin}/bin" 60 - ) 61 - ''; 62 - 63 - postFixup = '' 64 - share=$out/share/${pname} 65 - 66 - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 67 - --set-rpath "${atomEnv.libPath}:$share" \ 68 - $share/atom 69 - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 70 - --set-rpath "${atomEnv.libPath}" \ 71 - $share/resources/app/apm/bin/node 72 - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 73 - $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux 74 - 75 - dugite=$share/resources/app.asar.unpacked/node_modules/dugite 76 - rm -f $dugite/git/bin/git 77 - ln -s ${pkgs.git}/bin/git $dugite/git/bin/git 78 - rm -f $dugite/git/libexec/git-core/git 79 - ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git 80 - 81 - find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; 82 - 83 - sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop 84 - ''; 85 - 86 - meta = with lib; { 87 - description = "A hackable text editor for the 21st Century"; 88 - homepage = "https://atom.io/"; 89 - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 90 - license = licenses.mit; 91 - maintainers = with maintainers; [ offline ysndr ]; 92 - platforms = platforms.x86_64; 93 - inherit broken; 94 - }; 95 - }; 96 - in lib.mapAttrs common versions
···
-23
pkgs/applications/editors/atom/env.nix
··· 1 - { stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig 2 - , gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr 3 - , nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk 4 - , at-spi2-core, libdbusmenu, libdrm, mesa 5 - }: 6 - 7 - let 8 - packages = [ 9 - stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype 10 - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss 11 - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst 12 - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr 13 - xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify 14 - xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu 15 - libdrm 16 - mesa # required for libgbm 17 - ]; 18 - 19 - libPathNative = lib.makeLibraryPath packages; 20 - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; 21 - libPath = "${libPathNative}:${libPath64}"; 22 - 23 - in { inherit packages libPath; }
···
+38 -6
pkgs/applications/editors/pulsar/default.nix
··· 1 { lib 2 , stdenv 3 , git 4 - , runtimeShell 5 , fetchurl 6 , wrapGAppsHook 7 , glib 8 , gtk3 9 - , atomEnv 10 , xorg 11 , libxkbcommon 12 - , hunspell 13 , hunspellDicts 14 , useHunspell ? true 15 , languages ? [ "en_US" ] 16 , withNemoAction ? true 17 , makeDesktopItem 18 , copyDesktopItems 19 - , makeWrapper 20 , asar 21 , python3 22 }: ··· 32 aarch64-linux.hash = "sha256-GdPnmhMZR3Y2WB2j98JEWomdKFZuTgxN8oga/tBwA4U="; 33 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 34 35 - additionalLibs = lib.makeLibraryPath [ 36 xorg.libxshmfence 37 libxkbcommon 38 xorg.libxkbfile 39 stdenv.cc.cc.lib 40 ]; 41 - newLibpath = "${atomEnv.libPath}:${additionalLibs}"; 42 43 # Hunspell 44 hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages;
··· 1 { lib 2 , stdenv 3 , git 4 , fetchurl 5 , wrapGAppsHook 6 + , alsa-lib 7 + , at-spi2-atk 8 + , cairo 9 + , cups 10 + , dbus 11 + , expat 12 + , gdk-pixbuf 13 , glib 14 , gtk3 15 + , mesa 16 + , nss 17 + , nspr 18 , xorg 19 + , libdrm 20 + , libsecret 21 , libxkbcommon 22 + , pango 23 + , systemd 24 , hunspellDicts 25 , useHunspell ? true 26 , languages ? [ "en_US" ] 27 , withNemoAction ? true 28 , makeDesktopItem 29 , copyDesktopItems 30 , asar 31 , python3 32 }: ··· 42 aarch64-linux.hash = "sha256-GdPnmhMZR3Y2WB2j98JEWomdKFZuTgxN8oga/tBwA4U="; 43 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 44 45 + newLibpath = lib.makeLibraryPath [ 46 + alsa-lib 47 + at-spi2-atk 48 + cairo 49 + cups 50 + dbus 51 + expat 52 + gdk-pixbuf 53 + glib 54 + gtk3 55 + libsecret 56 + mesa 57 + nss 58 + nspr 59 + libdrm 60 + xorg.libX11 61 + xorg.libxcb 62 + xorg.libXcomposite 63 + xorg.libXdamage 64 + xorg.libXext 65 + xorg.libXfixes 66 + xorg.libXrandr 67 xorg.libxshmfence 68 libxkbcommon 69 xorg.libxkbfile 70 + pango 71 stdenv.cc.cc.lib 72 + systemd 73 ]; 74 75 # Hunspell 76 hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages;
+2 -2
pkgs/applications/editors/vscode/generic.nix
··· 1 { stdenv, lib, makeDesktopItem 2 , unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages 3 - , atomEnv, at-spi2-atk, autoPatchelfHook 4 , systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland 5 , libglvnd, libkrb5 6 ··· 67 }; 68 69 buildInputs = [ libsecret libXScrnSaver libxshmfence ] 70 - ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages); 71 72 runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; 73
··· 1 { stdenv, lib, makeDesktopItem 2 , unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages 3 + , at-spi2-atk, autoPatchelfHook, alsa-lib, mesa, nss, nspr, xorg 4 , systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland 5 , libglvnd, libkrb5 6 ··· 67 }; 68 69 buildInputs = [ libsecret libXScrnSaver libxshmfence ] 70 + ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; 71 72 runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; 73
+48 -24
pkgs/applications/misc/azuredatastudio/default.nix
··· 4 , copyDesktopItems 5 , makeDesktopItem 6 , makeWrapper 7 - , libuuid 8 - , libunwind 9 - , libxkbcommon 10 - , icu 11 - , openssl 12 - , zlib 13 , curl 14 - , at-spi2-core 15 - , at-spi2-atk 16 , gnutar 17 - , atomEnv 18 - , libkrb5 19 , libdrm 20 , mesa 21 , xorg 22 }: 23 24 # from justinwoo/azuredatastudio-nix ··· 115 sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; 116 117 rpath = lib.concatStringsSep ":" [ 118 - atomEnv.libPath 119 - ( 120 - lib.makeLibraryPath [ 121 - libuuid 122 - at-spi2-core 123 - at-spi2-atk 124 - stdenv.cc.cc.lib 125 - libkrb5 126 - libdrm 127 - libxkbcommon 128 - mesa 129 - xorg.libxshmfence 130 - ] 131 - ) 132 targetPath 133 sqltoolsserviceRpath 134 ];
··· 4 , copyDesktopItems 5 , makeDesktopItem 6 , makeWrapper 7 + , alsa-lib 8 + , at-spi2-atk 9 + , at-spi2-core 10 + , cairo 11 + , cups 12 , curl 13 + , dbus 14 + , expat 15 + , gdk-pixbuf 16 + , glib 17 , gnutar 18 + , gtk3 19 + , icu 20 , libdrm 21 + , libunwind 22 + , libuuid 23 + , libxkbcommon 24 , mesa 25 + , nspr 26 + , nss 27 + , openssl 28 + , pango 29 + , systemd 30 , xorg 31 + , zlib 32 }: 33 34 # from justinwoo/azuredatastudio-nix ··· 125 sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; 126 127 rpath = lib.concatStringsSep ":" [ 128 + (lib.makeLibraryPath [ 129 + alsa-lib 130 + at-spi2-atk 131 + cairo 132 + cups 133 + dbus 134 + expat 135 + gdk-pixbuf 136 + glib 137 + gtk3 138 + mesa 139 + nss 140 + nspr 141 + libdrm 142 + xorg.libX11 143 + xorg.libxcb 144 + xorg.libXcomposite 145 + xorg.libXdamage 146 + xorg.libXext 147 + xorg.libXfixes 148 + xorg.libXrandr 149 + xorg.libxshmfence 150 + libxkbcommon 151 + xorg.libxkbfile 152 + pango 153 + stdenv.cc.cc.lib 154 + systemd 155 + ]) 156 targetPath 157 sqltoolsserviceRpath 158 ];
+61 -8
pkgs/applications/misc/sidequest/default.nix
··· 1 - { stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, libxkbcommon, libxshmfence, at-spi2-atk, icu, openssl, zlib }: 2 let 3 pname = "sidequest"; 4 version = "0.10.33"; ··· 21 22 nativeBuildInputs = [ makeWrapper ]; 23 24 - buildCommand = '' 25 mkdir -p "$out/lib/SideQuest" "$out/bin" 26 tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 27 28 ln -s "$out/lib/SideQuest/sidequest" "$out/bin" 29 30 - fixupPhase 31 - 32 - # mkdir -p "$out/share/applications" 33 - # ln -s "${desktopItem}/share/applications/*" "$out/share/applications" 34 - 35 patchelf \ 36 --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 37 - --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \ 38 "$out/lib/SideQuest/sidequest" 39 ''; 40 };
··· 1 + { stdenv 2 + , lib 3 + , fetchurl 4 + , buildFHSEnv 5 + , makeDesktopItem 6 + , makeWrapper 7 + , alsa-lib 8 + , at-spi2-atk 9 + , cairo 10 + , cups 11 + , dbus 12 + , expat 13 + , gdk-pixbuf 14 + , glib 15 + , gtk3 16 + , mesa 17 + , nss 18 + , nspr 19 + , libdrm 20 + , xorg 21 + , libxkbcommon 22 + , libxshmfence 23 + , pango 24 + , systemd 25 + , icu 26 + , openssl 27 + , zlib 28 + }: 29 let 30 pname = "sidequest"; 31 version = "0.10.33"; ··· 48 49 nativeBuildInputs = [ makeWrapper ]; 50 51 + installPhase = '' 52 mkdir -p "$out/lib/SideQuest" "$out/bin" 53 tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 54 55 ln -s "$out/lib/SideQuest/sidequest" "$out/bin" 56 + ''; 57 58 + postFixup = let 59 + libPath = lib.makeLibraryPath [ 60 + alsa-lib 61 + at-spi2-atk 62 + cairo 63 + cups 64 + dbus 65 + expat 66 + gdk-pixbuf 67 + glib 68 + gtk3 69 + mesa 70 + nss 71 + nspr 72 + libdrm 73 + xorg.libX11 74 + xorg.libxcb 75 + xorg.libXcomposite 76 + xorg.libXdamage 77 + xorg.libXext 78 + xorg.libXfixes 79 + xorg.libXrandr 80 + xorg.libxshmfence 81 + libxkbcommon 82 + xorg.libxkbfile 83 + pango 84 + stdenv.cc.cc.lib 85 + systemd 86 + ]; 87 + in '' 88 patchelf \ 89 --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 90 + --set-rpath "${libPath}:$out/lib/SideQuest" \ 91 "$out/lib/SideQuest/sidequest" 92 ''; 93 };
+19 -6
pkgs/applications/misc/simplenote/default.nix
··· 1 - { atomEnv 2 - , autoPatchelfHook 3 , dpkg 4 , fetchurl 5 , makeDesktopItem ··· 7 , lib 8 , stdenv 9 , udev 10 , wrapGAppsHook 11 }: 12 13 let ··· 40 inherit pname version meta; 41 42 src = fetchurl { 43 - url = 44 - "https://github.com/Automattic/simplenote-electron/releases/download/" 45 - + "v${version}/Simplenote-linux-${version}-amd64.deb"; 46 inherit sha256; 47 }; 48 ··· 61 dontPatchELF = true; 62 dontWrapGApps = true; 63 64 nativeBuildInputs = [ 65 autoPatchelfHook 66 dpkg ··· 68 wrapGAppsHook 69 ]; 70 71 - buildInputs = atomEnv.packages; 72 73 unpackPhase = "dpkg-deb -x $src ."; 74
··· 1 + { autoPatchelfHook 2 , dpkg 3 , fetchurl 4 , makeDesktopItem ··· 6 , lib 7 , stdenv 8 , udev 9 + , alsa-lib 10 + , mesa 11 + , nss 12 + , nspr 13 + , systemd 14 , wrapGAppsHook 15 + , xorg 16 }: 17 18 let ··· 45 inherit pname version meta; 46 47 src = fetchurl { 48 + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${version}/Simplenote-linux-${version}-amd64.deb"; 49 inherit sha256; 50 }; 51 ··· 64 dontPatchELF = true; 65 dontWrapGApps = true; 66 67 + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron 68 nativeBuildInputs = [ 69 autoPatchelfHook 70 dpkg ··· 72 wrapGAppsHook 73 ]; 74 75 + buildInputs = [ 76 + alsa-lib 77 + mesa 78 + xorg.libXScrnSaver 79 + xorg.libXtst 80 + nss 81 + nspr 82 + stdenv.cc.cc 83 + systemd 84 + ]; 85 86 unpackPhase = "dpkg-deb -x $src ."; 87
+1 -19
pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
··· 1 { lib 2 , stdenv 3 , fetchurl 4 - , atomEnv 5 , electron_26 6 - , systemd 7 - , pulseaudio 8 - , libxshmfence 9 - , libnotify 10 - , libappindicator-gtk3 11 , makeWrapper 12 - , autoPatchelfHook 13 }: 14 15 let ··· 38 39 src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); 40 41 - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; 42 - 43 - buildInputs = atomEnv.packages ++ [ 44 - libxshmfence 45 - ]; 46 - 47 - runtimeDependencies = [ 48 - (lib.getLib systemd) 49 - pulseaudio 50 - libnotify 51 - libappindicator-gtk3 52 - ]; 53 54 installPhase = '' 55 runHook preInstall
··· 1 { lib 2 , stdenv 3 , fetchurl 4 , electron_26 5 , makeWrapper 6 }: 7 8 let ··· 31 32 src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); 33 34 + nativeBuildInputs = [ makeWrapper ]; 35 36 installPhase = '' 37 runHook preInstall
-15
pkgs/applications/networking/instant-messengers/teams/default.nix
··· 1 { lib 2 , stdenv 3 - , runtimeShell 4 , fetchurl 5 - , autoPatchelfHook 6 - , wrapGAppsHook 7 - , dpkg 8 - , atomEnv 9 - , libuuid 10 - , libappindicator-gtk3 11 - , pulseaudio 12 - , at-spi2-atk 13 - , coreutils 14 - , gawk 15 - , xdg-utils 16 - , systemd 17 - , asar 18 , xar 19 , cpio 20 , makeWrapper 21 - , enableRectOverlay ? false 22 }: 23 24 let
··· 1 { lib 2 , stdenv 3 , fetchurl 4 , xar 5 , cpio 6 , makeWrapper 7 }: 8 9 let
+16 -8
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
··· 1 - { atomEnv 2 - , autoPatchelfHook 3 , dpkg 4 , fetchurl 5 , makeDesktopItem ··· 11 , cpio 12 , xar 13 , libdbusmenu 14 - , libxshmfence 15 }: 16 17 let ··· 64 inherit pname version meta; 65 66 src = fetchurl { 67 - url = "https://wire-app.wire.com/linux/debian/pool/main/" 68 - + "Wire-${version}_amd64.deb"; 69 inherit hash; 70 }; 71 ··· 85 dontPatchELF = true; 86 dontWrapGApps = true; 87 88 nativeBuildInputs = [ 89 autoPatchelfHook 90 dpkg ··· 92 wrapGAppsHook 93 ]; 94 95 - buildInputs = [ libxshmfence ] ++ atomEnv.packages; 96 97 unpackPhase = '' 98 runHook preUnpack ··· 132 inherit pname version meta; 133 134 src = fetchurl { 135 - url = "https://github.com/wireapp/wire-desktop/releases/download/" 136 - + "macos%2F${version}/Wire.pkg"; 137 inherit hash; 138 }; 139
··· 1 + { autoPatchelfHook 2 , dpkg 3 , fetchurl 4 , makeDesktopItem ··· 10 , cpio 11 , xar 12 , libdbusmenu 13 + , alsa-lib 14 + , mesa 15 + , nss 16 + , nspr 17 + , systemd 18 }: 19 20 let ··· 67 inherit pname version meta; 68 69 src = fetchurl { 70 + url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb"; 71 inherit hash; 72 }; 73 ··· 87 dontPatchELF = true; 88 dontWrapGApps = true; 89 90 + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron 91 nativeBuildInputs = [ 92 autoPatchelfHook 93 dpkg ··· 95 wrapGAppsHook 96 ]; 97 98 + buildInputs = [ 99 + alsa-lib 100 + mesa 101 + nss 102 + nspr 103 + systemd 104 + ]; 105 106 unpackPhase = '' 107 runHook preUnpack ··· 141 inherit pname version meta; 142 143 src = fetchurl { 144 + url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg"; 145 inherit hash; 146 }; 147
+10 -4
pkgs/applications/networking/termius/default.nix
··· 1 - { atomEnv 2 - , autoPatchelfHook 3 , squashfsTools 4 , fetchurl 5 , makeDesktopItem 6 , makeWrapper 7 , stdenv 8 , lib 9 , udev 10 , wrapGAppsHook 11 - , libxshmfence 12 }: 13 14 stdenv.mkDerivation rec { ··· 41 dontPatchELF = true; 42 dontWrapGApps = true; 43 44 nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; 45 46 - buildInputs = atomEnv.packages ++ [ libxshmfence ]; 47 48 unpackPhase = '' 49 runHook preUnpack
··· 1 + { autoPatchelfHook 2 , squashfsTools 3 + , alsa-lib 4 , fetchurl 5 , makeDesktopItem 6 , makeWrapper 7 , stdenv 8 , lib 9 + , libsecret 10 + , mesa 11 , udev 12 , wrapGAppsHook 13 }: 14 15 stdenv.mkDerivation rec { ··· 42 dontPatchELF = true; 43 dontWrapGApps = true; 44 45 + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron 46 nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; 47 48 + buildInputs = [ 49 + alsa-lib 50 + libsecret 51 + mesa 52 + ]; 53 54 unpackPhase = '' 55 runHook preUnpack
+14 -4
pkgs/applications/office/trilium/desktop.nix
··· 1 { stdenv, lib, unzip, autoPatchelfHook 2 - , fetchurl, atomEnv, makeWrapper 3 - , makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence 4 , metaCommon 5 }: 6 ··· 24 25 src = fetchurl linuxSource; 26 27 nativeBuildInputs = [ 28 autoPatchelfHook 29 makeWrapper ··· 31 copyDesktopItems 32 ]; 33 34 - buildInputs = atomEnv.packages ++ [ libxshmfence ]; 35 36 desktopItems = [ 37 (makeDesktopItem { ··· 64 ''; 65 66 # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) 67 preFixup = '' 68 - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) 69 ''; 70 71 dontStrip = true;
··· 1 { stdenv, lib, unzip, autoPatchelfHook 2 + , fetchurl, makeWrapper 3 + , alsa-lib, mesa, nss, nspr, systemd 4 + , makeDesktopItem, copyDesktopItems, wrapGAppsHook 5 , metaCommon 6 }: 7 ··· 25 26 src = fetchurl linuxSource; 27 28 + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron 29 nativeBuildInputs = [ 30 autoPatchelfHook 31 makeWrapper ··· 33 copyDesktopItems 34 ]; 35 36 + buildInputs = [ 37 + alsa-lib 38 + mesa 39 + nss 40 + nspr 41 + stdenv.cc.cc 42 + systemd 43 + ]; 44 45 desktopItems = [ 46 (makeDesktopItem { ··· 73 ''; 74 75 # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) 76 + # Error: libstdc++.so.6: cannot open shared object file: No such file or directory 77 preFixup = '' 78 + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}) 79 ''; 80 81 dontStrip = true;
+2 -22
pkgs/development/tools/electron/binary/default.nix
··· 1 - { lib, stdenv 2 - , libXScrnSaver 3 - , makeWrapper 4 - , fetchurl 5 - , wrapGAppsHook 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 - }@args: 21 22 let 23 - mkElectron = import ./generic.nix args; 24 in 25 rec { 26 - 27 electron-bin = electron_26-bin; 28 29 electron_10-bin = mkElectron "10.4.7" {
··· 1 + { callPackage }: 2 3 let 4 + mkElectron = callPackage ./generic.nix { }; 5 in 6 rec { 7 electron-bin = electron_26-bin; 8 9 electron_10-bin = mkElectron "10.4.7" {
+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 '';
+15 -3
pkgs/tools/misc/hakuneko/default.nix
··· 1 - { atomEnv 2 - , autoPatchelfHook 3 , dpkg 4 , fetchurl 5 , makeDesktopItem ··· 8 , stdenv 9 , lib 10 , wrapGAppsHook 11 }: 12 let 13 desktopItem = makeDesktopItem { ··· 39 dontPatchELF = true; 40 dontWrapGApps = true; 41 42 nativeBuildInputs = [ 43 autoPatchelfHook 44 dpkg ··· 46 wrapGAppsHook 47 ]; 48 49 - buildInputs = atomEnv.packages; 50 51 unpackPhase = '' 52 # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
··· 1 + { autoPatchelfHook 2 , dpkg 3 , fetchurl 4 , makeDesktopItem ··· 7 , stdenv 8 , lib 9 , wrapGAppsHook 10 + , alsa-lib 11 + , nss 12 + , nspr 13 + , systemd 14 + , xorg 15 }: 16 let 17 desktopItem = makeDesktopItem { ··· 43 dontPatchELF = true; 44 dontWrapGApps = true; 45 46 + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron 47 nativeBuildInputs = [ 48 autoPatchelfHook 49 dpkg ··· 51 wrapGAppsHook 52 ]; 53 54 + buildInputs = [ 55 + alsa-lib 56 + nss 57 + nspr 58 + xorg.libXScrnSaver 59 + xorg.libXtst 60 + systemd 61 + ]; 62 63 unpackPhase = '' 64 # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
+4
pkgs/top-level/aliases.nix
··· 109 asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19 110 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 111 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 112 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 113 audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 114 audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09
··· 109 asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19 110 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 111 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 112 + atom = throw "'atom' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 113 + atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 114 + atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 115 + atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 116 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 117 audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 118 audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09
-6
pkgs/top-level/all-packages.nix
··· 30634 30635 atlassian-cli = callPackage ../applications/office/atlassian-cli { }; 30636 30637 - atomEnv = callPackage ../applications/editors/atom/env.nix { }; 30638 - 30639 - atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { }); 30640 - 30641 - inherit (atomPackages) atom atom-beta; 30642 - 30643 pulsar = callPackage ../applications/editors/pulsar { }; 30644 30645 asap = callPackage ../tools/audio/asap { };
··· 30634 30635 atlassian-cli = callPackage ../applications/office/atlassian-cli { }; 30636 30637 pulsar = callPackage ../applications/editors/pulsar { }; 30638 30639 asap = callPackage ../tools/audio/asap { };
-1
pkgs/top-level/packages-config.nix
··· 9 packageOverrides = super: with super; lib.mapAttrs (_: set: recurseIntoAttrs set) { 10 inherit (super) 11 apacheHttpdPackages 12 - atomPackages 13 fdbPackages 14 fusePackages 15 gns3Packages
··· 9 packageOverrides = super: with super; lib.mapAttrs (_: set: recurseIntoAttrs set) { 10 inherit (super) 11 apacheHttpdPackages 12 fdbPackages 13 fusePackages 14 gns3Packages