diff options
author | Will Dietz <w@wdtz.org> | 2018-09-27 16:38:10 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-09-28 11:43:16 -0500 |
commit | eb91037e7b5de99d887b4f58287e99abeeea05de (patch) | |
tree | f97fbcd1b8392d022890f94a2cf4a8101778e7d4 /pkgs/applications | |
parent | 196c405efb957a4c419b5eef5b6639ce95604fc8 (diff) | |
download | nixpkgs-eb91037e7b5de99d887b4f58287e99abeeea05de.tar nixpkgs-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.gz nixpkgs-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.bz2 nixpkgs-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.lz nixpkgs-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.xz nixpkgs-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.zst nixpkgs-eb91037e7b5de99d887b4f58287e99abeeea05de.zip |
tree-wide: patchelf used during build -> nativeBuildInputs
In a few cases it wasn't clear so I left them as-is. While visiting these moved other things to nativeBuildInputs when it was clear they were one of these cases: * makeWrapper * archive utilities (in order to unpack src) * a few of these might no longer be needed but leaving for another day
Diffstat (limited to 'pkgs/applications')
8 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 2bb84bce0b1..38996008f46 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -26,7 +26,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { ''; }; - buildInputs = [ makeWrapper patchelf p7zip unzip ]; + nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ]; patchPhase = '' get_file_size() { diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 58fcd59a2b2..b5fa9143ddb 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h"; }; - buildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; buildPhase = with xorg; '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index e98c68ff67c..a2ba2f09f76 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1"; }; - buildInputs = [ patchelf rpmextract ]; + nativeBuildInputs = [ patchelf rpmextract ]; libPath = stdenv.lib.makeLibraryPath diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index 4edf61ceaae..e033e532ec1 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { unpackPhase = '' ar p $src data.tar.xz | tar xJ ''; - buildInputs = [ binutils patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; + buildInputs = [ binutils ]; preFixup = with stdenv.lib; let lpath = makeLibraryPath [ diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index c07ad715afd..fdb4206d340 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { sed -i 's/^Exec=.*/Exec=spideroak/' $out/share/applications/SpiderOakONE.desktop ''; - buildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; meta = { homepage = https://spideroak.com; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index a1d613e6295..f3c4f22eae3 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0slqbqv4y43wz6wnh72s4n540ssapah0d12mndi0c7xr04kf2v2d"; }; - buildInputs = [ tcsh yap perl patchelf ]; + nativeBuildInputs = [ patchelf ]; + buildInputs = [ tcsh yap perl ]; installPhase = '' sharedir=$out/share/tptp diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 94fc9697e54..72b2131764d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -32,12 +32,12 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ]; + nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]; buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl - libXmu libpng patchelfUnstable python ] + libXmu libpng python ] ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index cb7bcad3592..fc957f6f461 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ patchelf makeWrapper ]; + buildInputs = [ cdrkit dbus ] ++ kernel.moduleBuildDependencies; installPhase = '' mkdir -p $out |