public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47444 from dtzWill/fix/patchelf-chrome-virtualbox-and-treewide

Browse Source 
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
parent c233b35c16 eb91037e7b
commit 3f0ae25538
21 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc-arm-embedded/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
sha256 = sha256;
};
buildInputs = [ bzip2 patchelf ];
nativeBuildInputs = [ bzip2 patchelf ];
dontPatchELF = true;
pkgs/development/compilers/mentor/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ let
stdenv.mkDerivation rec {
inherit name src;
buildInputs = [ patchelf ];
nativeBuildInputs = [ patchelf ];
buildCommand = ''
# Unpack tarball
pkgs/development/compilers/mlton/default.nix
+2 -1
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" ];
pkgs/development/compilers/opendylan/bin.nix
+1 -1
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"
pkgs/development/libraries/scmccid/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
})
else throw "Architecture not supported";
buildInputs = [ patchelf ];
nativeBuildInputs = [ patchelf ];
installPhase = ''
RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib