public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove usage of patchelfUnstable now that it's released

Browse Source
This commit is contained in:
Domen Kožar 2020-07-08 21:55:09 +02:00
parent bddf762cf5
commit 347ab190c7
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
7 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -3,7 +3,7 @@
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null , libva ? null
, pipewire_0_2 , pipewire_0_2
, gcc, nspr, nss, patchelfUnstable, runCommand , gcc, nspr, nss, runCommand
, lib , lib
# package customization # package customization
@ -69,8 +69,6 @@ let
# The .deb file for Google Chrome # The .deb file for Google Chrome
src = upstream-info.binary; src = upstream-info.binary;
nativeBuildInputs = [ patchelfUnstable ];
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
unpackCmd = let unpackCmd = let

1
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -4,7 +4,6 @@
, nspr , nspr
, nss , nss
, fetchzip , fetchzip
, patchelfUnstable
, enablePepperFlash ? false , enablePepperFlash ? false
, upstream-info , upstream-info

4
pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
View File

@ -2,7 +2,7 @@
, makeWrapper, ed , makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null , libva ? null
, gcc, nspr, nss, patchelfUnstable, runCommand , gcc, nspr, nss, runCommand
, lib , lib
# package customization # package customization
@ -67,8 +67,6 @@ let
# The .deb file for Google Chrome # The .deb file for Google Chrome
src = upstream-info.binary; src = upstream-info.binary;
nativeBuildInputs = [ patchelfUnstable ];
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
unpackCmd = let unpackCmd = let

1
pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
View File

@ -4,7 +4,6 @@
, nspr , nspr
, nss , nss
, fetchzip , fetchzip
, patchelfUnstable
, enablePepperFlash ? false , enablePepperFlash ? false
, upstream-info , upstream-info

6
pkgs/applications/networking/instant-messengers/bluejeans/default.nix
View File

@ -1,8 +1,6 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, rpmextract , rpmextract
, patchelf
, patchelfUnstable
, libnotify , libnotify
, libuuid , libuuid
, cairo , cairo
@ -96,11 +94,11 @@ stdenv.mkDerivation rec {
mv usr/share share mv usr/share share
rmdir usr rmdir usr
${patchelf}/bin/patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--replace-needed libudev.so.0 libudev.so.1 \ --replace-needed libudev.so.0 libudev.so.1 \
opt/BlueJeans/bluejeans-v2 opt/BlueJeans/bluejeans-v2
${patchelfUnstable}/bin/patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
opt/BlueJeans/resources/BluejeansHelper opt/BlueJeans/resources/BluejeansHelper

3
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -14,7 +14,6 @@
, enableHardening ? false , enableHardening ? false
, headless ? false , headless ? false
, enable32bitGuests ? true , enable32bitGuests ? true
, patchelfUnstable # needed until 0.10 is released
}: }:
with stdenv.lib; with stdenv.lib;
@ -46,7 +45,7 @@ in stdenv.mkDerivation {
outputs = [ "out" "modsrc" ]; 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; ++ optional (!headless) wrapQtAppsHook;
# Wrap manually because we wrap just a small number of executables. # Wrap manually because we wrap just a small number of executables.

4
pkgs/tools/networking/ngrok-2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, patchelfUnstable }: { stdenv, fetchurl }:
with stdenv.lib; with stdenv.lib;
@ -24,8 +24,6 @@ stdenv.mkDerivation {
sourceRoot = "."; sourceRoot = ".";
nativeBuildInputs = optionals stdenv.isLinux [ patchelfUnstable ];
unpackPhase = "cp $src ngrok"; unpackPhase = "cp $src ngrok";
buildPhase = "chmod a+x ngrok"; buildPhase = "chmod a+x ngrok";