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:
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
||||
sha256 = sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ bzip2 patchelf ];
|
||||
nativeBuildInputs = [ bzip2 patchelf ];
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ let
|
||||
stdenv.mkDerivation rec {
|
||||
inherit name src;
|
||||
|
||||
buildInputs = [ patchelf ];
|
||||
nativeBuildInputs = [ patchelf ];
|
||||
|
||||
buildCommand = ''
|
||||
# Unpack tarball
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user