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
This commit is contained in:
parent
196c405efb
commit
eb91037e7b
|
@ -26,7 +26,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ makeWrapper patchelf p7zip unzip ];
|
nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ];
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
get_file_size() {
|
get_file_size() {
|
||||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h";
|
sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ patchelf makeWrapper ];
|
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||||
|
|
||||||
buildPhase = with xorg; ''
|
buildPhase = with xorg; ''
|
||||||
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
|
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
|
||||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1";
|
sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ patchelf rpmextract ];
|
nativeBuildInputs = [ patchelf rpmextract ];
|
||||||
|
|
||||||
libPath =
|
libPath =
|
||||||
stdenv.lib.makeLibraryPath
|
stdenv.lib.makeLibraryPath
|
||||||
|
|
|
@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
ar p $src data.tar.xz | tar xJ
|
ar p $src data.tar.xz | tar xJ
|
||||||
'';
|
'';
|
||||||
buildInputs = [ binutils patchelf makeWrapper ];
|
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||||
|
buildInputs = [ binutils ];
|
||||||
|
|
||||||
preFixup = with stdenv.lib; let
|
preFixup = with stdenv.lib; let
|
||||||
lpath = makeLibraryPath [
|
lpath = makeLibraryPath [
|
||||||
|
|
|
@ -57,7 +57,7 @@ in stdenv.mkDerivation {
|
||||||
sed -i 's/^Exec=.*/Exec=spideroak/' $out/share/applications/SpiderOakONE.desktop
|
sed -i 's/^Exec=.*/Exec=spideroak/' $out/share/applications/SpiderOakONE.desktop
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ patchelf makeWrapper ];
|
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = https://spideroak.com;
|
homepage = https://spideroak.com;
|
||||||
|
|
|
@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0slqbqv4y43wz6wnh72s4n540ssapah0d12mndi0c7xr04kf2v2d";
|
sha256 = "0slqbqv4y43wz6wnh72s4n540ssapah0d12mndi0c7xr04kf2v2d";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ tcsh yap perl patchelf ];
|
nativeBuildInputs = [ patchelf ];
|
||||||
|
buildInputs = [ tcsh yap perl ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
sharedir=$out/share/tptp
|
sharedir=$out/share/tptp
|
||||||
|
|
|
@ -32,12 +32,12 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
outputs = [ "out" "modsrc" ];
|
outputs = [ "out" "modsrc" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ];
|
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
|
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
|
||||||
libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
|
libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
|
||||||
libXmu libpng patchelfUnstable python ]
|
libXmu libpng python ]
|
||||||
++ optional javaBindings jdk
|
++ optional javaBindings jdk
|
||||||
++ optional pythonBindings python # Python is needed even when not building bindings
|
++ optional pythonBindings python # Python is needed even when not building bindings
|
||||||
++ optional pulseSupport libpulseaudio
|
++ optional pulseSupport libpulseaudio
|
||||||
|
|
|
@ -36,7 +36,8 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
|
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
|
||||||
|
|
||||||
buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies;
|
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||||
|
buildInputs = [ cdrkit dbus ] ++ kernel.moduleBuildDependencies;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
|
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
||||||
sha256 = sha256;
|
sha256 = sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bzip2 patchelf ];
|
nativeBuildInputs = [ bzip2 patchelf ];
|
||||||
|
|
||||||
dontPatchELF = true;
|
dontPatchELF = true;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ let
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
inherit name src;
|
inherit name src;
|
||||||
|
|
||||||
buildInputs = [ patchelf ];
|
nativeBuildInputs = [ patchelf ];
|
||||||
|
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
# Unpack tarball
|
# Unpack tarball
|
||||||
|
|
|
@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
sourceRoot = name;
|
sourceRoot = name;
|
||||||
|
|
||||||
buildInputs = [ gmp ] ++ stdenv.lib.optional stdenv.isLinux patchelf;
|
buildInputs = [ gmp ];
|
||||||
|
nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
|
||||||
|
|
||||||
makeFlags = [ "all-no-docs" ];
|
makeFlags = [ "all-no-docs" ];
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||||
}
|
}
|
||||||
else throw "platform ${stdenv.hostPlatform.system} not supported.";
|
else throw "platform ${stdenv.hostPlatform.system} not supported.";
|
||||||
|
|
||||||
buildInputs = [ patchelf boehmgc gnused makeWrapper ];
|
nativeBuildInputs = [ patchelf boehmgc gnused makeWrapper ];
|
||||||
|
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir -p "$out"
|
mkdir -p "$out"
|
||||||
|
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||||
})
|
})
|
||||||
else throw "Architecture not supported";
|
else throw "Architecture not supported";
|
||||||
|
|
||||||
buildInputs = [ patchelf ];
|
nativeBuildInputs = [ patchelf ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
|
RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
|
||||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0jmc1cmdz1rcvqc9ilzib1kilpwap6v0d331l6q53wsibdzsz3ss";
|
sha256 = "0jmc1cmdz1rcvqc9ilzib1kilpwap6v0d331l6q53wsibdzsz3ss";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgs.unzip patchelf makeWrapper];
|
nativeBuildInputs = [ pkgs.unzip patchelf makeWrapper];
|
||||||
|
|
||||||
installPhase = let
|
installPhase = let
|
||||||
gameDir = "$out/openarena-$version";
|
gameDir = "$out/openarena-$version";
|
||||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||||
inherit (config.planetary_annihilation) url sha256;
|
inherit (config.planetary_annihilation) url sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ patchelf makeWrapper ];
|
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/{bin,lib}
|
mkdir -p $out/{bin,lib}
|
||||||
|
|
|
@ -5,7 +5,7 @@ let
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
inherit name src;
|
inherit name src;
|
||||||
|
|
||||||
buildInputs = [ unzip patchelf ];
|
nativeBuildInputs = [ unzip patchelf ];
|
||||||
|
|
||||||
rtdeps = stdenv.lib.makeLibraryPath
|
rtdeps = stdenv.lib.makeLibraryPath
|
||||||
[ xorg.libXxf86vm xorg.libXext openal ]
|
[ xorg.libXxf86vm xorg.libXext openal ]
|
||||||
|
|
|
@ -26,7 +26,8 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k";
|
sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cups' gcc ghostscript glibc patchelf ];
|
nativeBuildInputs = [ patchelf ];
|
||||||
|
buildInputs = [ cups' gcc ghostscript glibc ];
|
||||||
|
|
||||||
inherit gcc ghostscript glibc;
|
inherit gcc ghostscript glibc;
|
||||||
cups = cups';
|
cups = cups';
|
||||||
|
|
|
@ -30,7 +30,7 @@ let plugins = {
|
||||||
version = "1.0.1";
|
version = "1.0.1";
|
||||||
pluginVersion = "2.1.2-1";
|
pluginVersion = "2.1.2-1";
|
||||||
|
|
||||||
buildInputs = [ patchelf rpm ];
|
nativeBuildInputs = [ patchelf rpm ];
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz";
|
url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz";
|
||||||
sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r";
|
sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r";
|
||||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "19ir6x4c01825hpx2wbbcxkk70ymwbw4j03v8b2xc13ayylwzx0r";
|
sha256 = "19ir6x4c01825hpx2wbbcxkk70ymwbw4j03v8b2xc13ayylwzx0r";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ patchelf makeWrapper ];
|
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||||
phases = [ "unpackPhase" "installPhase" ];
|
phases = [ "unpackPhase" "installPhase" ];
|
||||||
|
|
||||||
unpackCmd = ''
|
unpackCmd = ''
|
||||||
|
|
Loading…
Reference in a new issue