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
This commit is contained in:
Will Dietz
2018-09-28 14:25:05 -05:00
committed by GitHub
21 changed files with 27 additions and 23 deletions

View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation {
sha256 = sha256;
};
buildInputs = [ bzip2 patchelf ];
nativeBuildInputs = [ bzip2 patchelf ];
dontPatchELF = true;

View File

@@ -10,7 +10,7 @@ let
stdenv.mkDerivation rec {
inherit name src;
buildInputs = [ patchelf ];
nativeBuildInputs = [ patchelf ];
buildCommand = ''
# Unpack tarball

View File

@@ -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" ];

View File

@@ -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"