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/networking | |
| parent | 196c405efb957a4c419b5eef5b6639ce95604fc8 (diff) | |
| download | nixlib-eb91037e7b5de99d887b4f58287e99abeeea05de.tar nixlib-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.gz nixlib-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.bz2 nixlib-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.lz nixlib-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.xz nixlib-eb91037e7b5de99d887b4f58287e99abeeea05de.tar.zst nixlib-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/networking')
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index e98c68ff67c2..a2ba2f09f764 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 4edf61ceaaed..e033e532ec1a 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 c07ad715afd2..fdb4206d340f 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; |