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

tree-wide: patchelf used during build -> nativeBuildInputs

Browse Source 
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:
Will Dietz
2018-09-28 11:43:16 -05:00
parent 196c405efb
commit eb91037e7b
19 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/virtualbox/default.nix
+2 -2
View File
@@ -32,12 +32,12 @@ in stdenv.mkDerivation {
outputs = [ "out" "modsrc" ];
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ];
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ];
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
libXmu libpng patchelfUnstable python ]
libXmu libpng python ]
++ optional javaBindings jdk
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+2 -1
View File
@@ -36,7 +36,8 @@ stdenv.mkDerivation {
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 = ''
mkdir -p $out