diff options
author | Domen Kožar <domen@dev.si> | 2020-07-08 21:55:09 +0200 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2020-07-08 21:55:09 +0200 |
commit | 347ab190c7571858d5c55181d718c5817545dcc9 (patch) | |
tree | dcbf6b016092b8df27917c6ad73a79d3e68c28ff | |
parent | bddf762cf59282ad707a1687080f6f84db96bfae (diff) | |
download | nixpkgs-347ab190c7571858d5c55181d718c5817545dcc9.tar nixpkgs-347ab190c7571858d5c55181d718c5817545dcc9.tar.gz nixpkgs-347ab190c7571858d5c55181d718c5817545dcc9.tar.bz2 nixpkgs-347ab190c7571858d5c55181d718c5817545dcc9.tar.lz nixpkgs-347ab190c7571858d5c55181d718c5817545dcc9.tar.xz nixpkgs-347ab190c7571858d5c55181d718c5817545dcc9.tar.zst nixpkgs-347ab190c7571858d5c55181d718c5817545dcc9.zip |
remove usage of patchelfUnstable now that it's released
7 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 2fea779a8f8..8efc09ce6f8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -3,7 +3,7 @@ , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 -, gcc, nspr, nss, patchelfUnstable, runCommand +, gcc, nspr, nss, runCommand , lib # package customization @@ -69,8 +69,6 @@ let # The .deb file for Google Chrome src = upstream-info.binary; - nativeBuildInputs = [ patchelfUnstable ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 707bf2056f0..fb5b89ba4e7 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -4,7 +4,6 @@ , nspr , nss , fetchzip -, patchelfUnstable , enablePepperFlash ? false , upstream-info diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index 9d6c7fada70..4b6c3322182 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -2,7 +2,7 @@ , makeWrapper, ed , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null -, gcc, nspr, nss, patchelfUnstable, runCommand +, gcc, nspr, nss, runCommand , lib # package customization @@ -67,8 +67,6 @@ let # The .deb file for Google Chrome src = upstream-info.binary; - nativeBuildInputs = [ patchelfUnstable ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index d45a3c9f864..663d8e7f6b6 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -4,7 +4,6 @@ , nspr , nss , fetchzip -, patchelfUnstable , enablePepperFlash ? false , upstream-info diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index ed2158c6a16..0143e401c19 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -1,8 +1,6 @@ { stdenv , fetchurl , rpmextract -, patchelf -, patchelfUnstable , libnotify , libuuid , cairo @@ -96,11 +94,11 @@ stdenv.mkDerivation rec { mv usr/share share rmdir usr - ${patchelf}/bin/patchelf \ + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --replace-needed libudev.so.0 libudev.so.1 \ opt/BlueJeans/bluejeans-v2 - ${patchelfUnstable}/bin/patchelf \ + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ opt/BlueJeans/resources/BluejeansHelper diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 7b7929d9f1d..f38bafa42d7 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -14,7 +14,6 @@ , enableHardening ? false , headless ? false , enable32bitGuests ? true -, patchelfUnstable # needed until 0.10 is released }: with stdenv.lib; @@ -46,7 +45,7 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ] + nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index f17849ef757..d9c1acc374c 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelfUnstable }: +{ stdenv, fetchurl }: with stdenv.lib; @@ -24,8 +24,6 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = optionals stdenv.isLinux [ patchelfUnstable ]; - unpackPhase = "cp $src ngrok"; buildPhase = "chmod a+x ngrok"; |