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/development/compilers | |
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/development/compilers')
-rw-r--r-- | pkgs/development/compilers/gcc-arm-embedded/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/mentor/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/mlton/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/opendylan/bin.nix | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 7908d6d06ef8..039b5a9ce362 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = sha256; }; - buildInputs = [ bzip2 patchelf ]; + nativeBuildInputs = [ bzip2 patchelf ]; dontPatchELF = true; diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 7cd3c1793661..4f09df7f2ea0 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -10,7 +10,7 @@ let stdenv.mkDerivation rec { inherit name src; - buildInputs = [ patchelf ]; + nativeBuildInputs = [ patchelf ]; buildCommand = '' # Unpack tarball diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 6b6907b0b2e6..0b991e22fa98 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { sourceRoot = name; - buildInputs = [ gmp ] ++ stdenv.lib.optional stdenv.isLinux patchelf; + buildInputs = [ gmp ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; makeFlags = [ "all-no-docs" ]; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 9b721312bb78..e11bb7251a60 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { } else throw "platform ${stdenv.hostPlatform.system} not supported."; - buildInputs = [ patchelf boehmgc gnused makeWrapper ]; + nativeBuildInputs = [ patchelf boehmgc gnused makeWrapper ]; buildCommand = '' mkdir -p "$out" |