diff options
author | Will Dietz <github@wdtz.org> | 2018-09-28 14:25:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-28 14:25:05 -0500 |
commit | 3f0ae255386c2fcad87b673cda02f5b118b2c2e1 (patch) | |
tree | c4a549e4d9dc4da6df96e1492a04a03d5a3c762c /pkgs/development/compilers | |
parent | c233b35c16a182ad232f1d3b9c750da77b8889f1 (diff) | |
parent | eb91037e7b5de99d887b4f58287e99abeeea05de (diff) | |
download | nixlib-3f0ae255386c2fcad87b673cda02f5b118b2c2e1.tar nixlib-3f0ae255386c2fcad87b673cda02f5b118b2c2e1.tar.gz nixlib-3f0ae255386c2fcad87b673cda02f5b118b2c2e1.tar.bz2 nixlib-3f0ae255386c2fcad87b673cda02f5b118b2c2e1.tar.lz nixlib-3f0ae255386c2fcad87b673cda02f5b118b2c2e1.tar.xz nixlib-3f0ae255386c2fcad87b673cda02f5b118b2c2e1.tar.zst nixlib-3f0ae255386c2fcad87b673cda02f5b118b2c2e1.zip |
Merge pull request #47444 from dtzWill/fix/patchelf-chrome-virtualbox-and-treewide
google-chrome, treewide: fix patchelf usages to not crash constantly, patchelf as native
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" |