b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

makeWrapper to nativeBuildInputs (#167225)

Browse source
This commit is contained in:
Rick van Schijndel 2022-04-05 09:34:48 +02:00 committed by GitHub
parent d396c7d316
commit 9f98b2bd7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/graphics/imgbrd-grabber/default.nix
View file

@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
openssl openssl
makeWrapper
libpulseaudio libpulseaudio
typescript typescript
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper
qtmultimedia qtmultimedia
qtbase qtbase
qtdeclarative qtdeclarative

6
pkgs/applications/graphics/jpegrescan/default.nix
View file

@ -28,8 +28,12 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ perlPackages.FileSlurp ]; propagatedBuildInputs = [ perlPackages.FileSlurp ];
nativeBuildInputs = [
makeWrapper
];
buildInputs = [ buildInputs = [
perl libjpeg_turbo makeWrapper perl libjpeg_turbo
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/applications/graphics/synfigstudio/default.nix
View file

@ -103,10 +103,10 @@ stdenv.mkDerivation {
preConfigure = "./bootstrap.sh"; preConfigure = "./bootstrap.sh";
nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; nativeBuildInputs = [ pkg-config autoreconfHook gettext makeWrapper ];
buildInputs = [ buildInputs = [
ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 libjack2 libsigcxx libxmlxx mlt-qt5
synfig which gnome.adwaita-icon-theme synfig which gnome.adwaita-icon-theme
]; ];

4
pkgs/development/libraries/hivex/default.nix
View file

@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
patches = [ ./hivex-syms.patch ]; patches = [ ./hivex-syms.patch ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
buildInputs = [ buildInputs = [
autoreconfHook makeWrapper libxml2 libxml2
] ]
++ (with perlPackages; [ perl IOStringy ]) ++ (with perlPackages; [ perl IOStringy ])
++ lib.optionals stdenv.isDarwin [ libiconv ]; ++ lib.optionals stdenv.isDarwin [ libiconv ];

3
pkgs/development/tools/phantomjs2/default.nix
View file

@ -25,11 +25,10 @@ in stdenv.mkDerivation rec {
sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq"; sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake makeWrapper ];
buildInputs = [ buildInputs = [
bison flex fontconfig freetype gperf icu openssl bison flex fontconfig freetype gperf icu openssl
libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase
makeWrapper
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AGL ApplicationServices AppKit Cocoa OpenGL AGL ApplicationServices AppKit Cocoa OpenGL
darwin.libobjc fakeClang cups darwin.libobjc fakeClang cups

6
pkgs/os-specific/linux/pam_usb/default.nix
View file

@ -41,8 +41,12 @@ stdenv.mkDerivation rec {
sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1"; sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1";
}; };
buildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
pkg-config
];
buildInputs = [
# pam_usb dependencies # pam_usb dependencies
dbus libxml2 pam pmount pkg-config dbus libxml2 pam pmount pkg-config
# pam_usb's tools dependencies # pam_usb's tools dependencies

5
pkgs/servers/monitoring/munin/default.nix
View file

@ -13,8 +13,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-p273O5JLFX1dA2caV3lVVL9YNTcGMSrC7DWieUfUmqI="; sha256 = "sha256-p273O5JLFX1dA2caV3lVVL9YNTcGMSrC7DWieUfUmqI=";
}; };
buildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
];
buildInputs = [
which which
coreutils coreutils
rrdtool rrdtool

2
pkgs/servers/owncast/default.nix
View file

@ -15,7 +15,7 @@ buildGoModule rec {
propagatedBuildInputs = [ ffmpeg ]; propagatedBuildInputs = [ ffmpeg ];
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
preInstall = '' preInstall = ''
mkdir -p $out mkdir -p $out

2
pkgs/servers/rt/default.nix
View file

@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
makeWrapper
]; ];
buildInputs = [ buildInputs = [
makeWrapper
perl perl
(buildEnv { (buildEnv {
name = "rt-perl-deps"; name = "rt-perl-deps";

2
pkgs/tools/X11/obconf/default.nix
View file

@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
makeWrapper
pkg-config pkg-config
]; ];
@ -22,7 +23,6 @@ stdenv.mkDerivation rec {
libSM libSM
libstartup_notification libstartup_notification
libxml2 libxml2
makeWrapper
openbox openbox
]; ];

5
pkgs/tools/misc/kisslicer/default.nix
View file

@ -27,8 +27,11 @@ stdenv.mkDerivation rec {
stripRoot = false; stripRoot = false;
}; };
buildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
];
buildInputs = [
libGLU libGL libGLU libGL
libX11 libX11
]; ];

6
pkgs/tools/misc/logstash/6.x.nix
View file

@ -26,8 +26,12 @@ let this = stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
dontPatchShebangs = true; dontPatchShebangs = true;
nativeBuildInputs = [
makeWrapper
];
buildInputs = [ buildInputs = [
makeWrapper jre jre
]; ];
installPhase = '' installPhase = ''

5
pkgs/tools/misc/logstash/7.x.nix
View file

@ -41,8 +41,11 @@ let
dontStrip = true; dontStrip = true;
dontPatchShebangs = true; dontPatchShebangs = true;
buildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
];
buildInputs = [
jre jre
]; ];