BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: makeWrapper buildInputs to nativeBuildInputs

Browse source 
most found with https://github.com/siraben/nix-lint
This commit is contained in:
Artturin 2022-08-15 06:40:21 +03:00
parent 2f27d03380
commit c6568adb00
64 changed files with 103 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/editors/eclipse/build-eclipse.nix
View file

@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
categories = [ "Development" ];
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11
libXrender libXtst libsecret makeWrapper zlib
libXrender libXtst libsecret zlib
] ++ lib.optional (webkitgtk != null) webkitgtk;
buildCommand = ''

2
pkgs/applications/editors/jupyter-kernels/octave/default.nix
View file

@ -22,7 +22,7 @@ rec {
launcher = runCommand "octave-kernel-launcher" {
inherit octave;
python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]);
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
} ''
mkdir -p $out/bin

2
pkgs/applications/editors/vim/plugins/vim-utils.nix
View file

@ -338,7 +338,7 @@ rec {
if vimrcFile != null then vimrcFile
else if vimrcConfig != null then mkVimrcFile vimrcConfig
else throw "at least one of vimrcConfig and vimrcFile must be specified";
bin = runCommand "${name}-bin" { buildInputs = [ makeWrapper ]; } ''
bin = runCommand "${name}-bin" { nativeBuildInputs = [ makeWrapper ]; } ''
vimrc=${lib.escapeShellArg vimrc}
gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""}

4
pkgs/applications/gis/grass/default.nix
View file

@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite
readline ffmpeg makeWrapper netcdf geos postgresql libmysqlclient blas
readline ffmpeg netcdf geos postgresql libmysqlclient blas
libLAS proj-datumgrid zstd wrapGAppsHook ]
++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK31 ]
++ lib.optional stdenv.isDarwin wxmac

3
pkgs/applications/graphics/timelapse-deflicker/default.nix
View file

@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/timelapse-deflicker --set PERL5LIB $PERL5LIB
'';
nativeBuildInputs = [ makeWrapper ];
buildInputs = with perlPackages; [
makeWrapper perl
perl
ImageMagick TermProgressBar ImageExifTool
FileType ClassMethodMaker
];

4
pkgs/applications/misc/eaglemode/default.nix
View file

@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff
librsvg glib gtk2 libXxf86vm libXext poppler xine-lib ghostscript makeWrapper ];
librsvg glib gtk2 libXxf86vm libXext poppler xine-lib ghostscript ];
# The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.

3
pkgs/applications/misc/ikiwiki/default.nix
View file

@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ which highlight ]
++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
TimeDate gettext DBFile CGISession CGIFormBuilder LocaleGettext
RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ])
++ lib.optionals docutilsSupport [

4
pkgs/applications/misc/lyx/default.nix
View file

@ -12,10 +12,10 @@ mkDerivation rec {
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [
qtbase qtsvg python3 file/*for libmagic*/ bc
hunspell makeWrapper # enchant
hunspell # enchant
];
configureFlags = [

5
pkgs/applications/misc/notify-osd-customizable/default.nix
View file

@ -24,11 +24,10 @@ in stdenv.mkDerivation rec {
preConfigure = "./autogen.sh --libexecdir=$(out)/bin";
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config makeWrapper libtool ];
buildInputs = [
glib libwnck libnotify dbus-glib makeWrapper
glib libwnck libnotify dbus-glib
gsettings-desktop-schemas gnome.gnome-common
libtool
];
configureFlags = [ "--libexecdir=$(out)/bin" ];

4
pkgs/applications/misc/notify-osd/default.nix
View file

@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [
glib libwnck libnotify dbus-glib makeWrapper
glib libwnck libnotify dbus-glib
gsettings-desktop-schemas
];

2
pkgs/applications/misc/rofi-emoji/default.nix
View file

@ -46,13 +46,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
pkg-config
makeWrapper
];
buildInputs = [
cairo
glib
libnotify
makeWrapper
rofi-unwrapped
wl-clipboard
xclip

3
pkgs/applications/misc/slic3r/default.nix
View file

@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
};
nativeBuildInputs = [ makeWrapper which ];
buildInputs =
[boost] ++
(with perlPackages; [ perl makeWrapper which
(with perlPackages; [ perl
EncodeLocale MathClipper ExtUtilsXSpp
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX

2
pkgs/applications/misc/tabula-java/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-IWHj//ZZOdfOCBJHnPnKNoYNtWl/f8H6ARYe1AkqB0U=";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
dontUnpack = true;
dontBuild = true;

3
pkgs/applications/networking/browsers/offpunk/default.nix
View file

@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy";
};
buildInputs = [ makeWrapper ] ++ otherDependencies ++ pythonDependencies;
nativeBuildInputs = [ makeWrapper ];
buildInputs = otherDependencies ++ pythonDependencies;
installPhase = ''
runHook preInstall

2
pkgs/applications/networking/instant-messengers/oysttyer/default.nix
View file

@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
perl
makeWrapper
];
propagatedBuildInputs = with perlPackages; [

2
pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
View file

@ -7,7 +7,7 @@ in symlinkJoin {
paths = [ pidgin ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/pidgin \

2
pkgs/applications/networking/instant-messengers/teams/default.nix
View file

@ -137,7 +137,7 @@ let
hash = "sha256-vLUEvOSBUyAJIWHOAIkTqTW/W6TkgmeyRzQbquZP810=";
};
buildInputs = [ xar cpio makeWrapper ];
nativeBuildInputs = [ xar cpio makeWrapper ];
unpackPhase = ''
xar -xf $src

2
pkgs/applications/networking/mailreaders/notmuch/mutt.nix
View file

@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
dontStrip = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
perl
makeWrapper
] ++ (with perlPackages; [
FileRemove
DigestSHA1

5
pkgs/applications/science/electronics/bitscope/common.nix
View file

@ -32,10 +32,7 @@ let
];
} // (attrs.meta or {});
buildInputs = [
dpkg
makeWrapper
];
nativeBuildInputs = [ makeWrapper dpkg ];
libs = attrs.libs or [
atk

4
pkgs/applications/science/math/pspp/default.nix
View file

@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan";
};
nativeBuildInputs = [ pkg-config texinfo python3 ];
nativeBuildInputs = [ pkg-config texinfo python3 makeWrapper ];
buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl
gtksourceview pango gettext
makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw
gsettings-desktop-schemas hicolor-icon-theme ssw
];
doCheck = false;

2
pkgs/applications/science/math/sage/sage-tests.nix
View file

@ -28,8 +28,8 @@ stdenv.mkDerivation {
pname = "sage-tests";
inherit src;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
makeWrapper
sage-with-env
];

3
pkgs/applications/science/math/sage/sage-with-env.nix
View file

@ -30,7 +30,6 @@ assert (!blas.isILP64) && (!lapack.isILP64);
let
buildInputs = [
pythonEnv # for patchShebangs
makeWrapper
pkg-config
blas lapack
singular
@ -73,7 +72,7 @@ let
[]
);
allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs);
allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]);
transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs ));
# fix differences between spkg and sage names
# (could patch sage instead, but this is more lightweight and also works for packages depending on sage)

5
pkgs/applications/science/math/sage/sage.nix
View file

@ -17,9 +17,8 @@ stdenv.mkDerivation rec {
pname = "sage";
src = sage-with-env.env.lib.src;
buildInputs = [
makeWrapper
] ++ lib.optionals requireSageTests [
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals requireSageTests [
# This is a hack to make sure sage-tests is evaluated. It doesn't acutally
# produce anything of value, it just decouples the tests from the build.
sage-tests

2
pkgs/applications/science/misc/openmodelica/combined/default.nix
View file

@ -11,7 +11,7 @@ symlinkJoin {
omshell
];
buildInputs = [ gnumake makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/OMEdit \

3
pkgs/applications/version-management/gitlab/default.nix
View file

@ -129,8 +129,9 @@ stdenv.mkDerivation {
inherit src;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools makeWrapper
rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools
];
patches = [

4
pkgs/applications/video/avidemux/default.nix
View file

@ -38,11 +38,11 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs =
[ yasm cmake pkg-config ]
[ yasm cmake pkg-config makeWrapper ]
++ lib.optional withQT wrapQtAppsHook;
buildInputs = [
zlib gettext libvdpau libva libXv sqlite fribidi fontconfig
freetype alsa-lib libXext libGLU makeWrapper
freetype alsa-lib libXext libGLU
] ++ lib.optional withX264 x264
++ lib.optional withX265 x265
++ lib.optional withXvid xvidcore

6
pkgs/development/compilers/ecl/16.1.2.nix
View file

@ -25,11 +25,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k=";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
libtool
makeWrapper
];
nativeBuildInputs = [ autoconf automake makeWrapper libtool ];
propagatedBuildInputs = [
libffi
gmp

6
pkgs/development/compilers/elm/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib }:
{ pkgs, lib, makeWrapper }:
let
@ -18,7 +18,7 @@ let
elmVersion = drv.version;
registryDat = ./registry.dat;
};
buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
jailbreak = true;
postInstall = ''
wrapProgram $out/bin/elm \
@ -214,7 +214,7 @@ in lib.makeScope pkgs.newScope (self: with self; {
elm-pages = nodePkgs."elm-pages".overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [ pkgs.makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# can't use `patches = [ <patch_file> ]` with a nodePkgs derivation;
# need to patch in one of the build phases instead.

3
pkgs/development/compilers/intercal/default.nix
View file

@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
})
];
buildInputs =
[ pkg-config bison flex makeWrapper ];
nativeBuildInputs = [ pkg-config bison flex makeWrapper ];
# Intercal invokes gcc, so we need an explicit PATH
postInstall = ''

4
pkgs/development/compilers/opa/default.nix
View file

@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ];
buildInputs = [ which perl jdk openssl coreutils zlib ncurses
makeWrapper gcc binutils gnumake nodejs
nativeBuildInputs = [ gcc binutils nodejs which makeWrapper ];
buildInputs = [ perl jdk openssl coreutils zlib ncurses
] ++ (with ocamlPackages; [
ocaml findlib ssl camlzip ulex ocamlgraph camlp4
]);

2
pkgs/development/compilers/open-watcom/wrapper.nix
View file

@ -36,7 +36,7 @@ let
paths = [ open-watcom ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
mkdir $out/bin

3
pkgs/development/compilers/opendylan/default.nix
View file

@ -13,8 +13,9 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
nativeBuildInputs = [ makeWrapper autoconf automake ];
buildInputs = (if stdenv.hostPlatform.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [
opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper
opendylan-bootstrap boehmgc perl
];
preConfigure = if stdenv.hostPlatform.system == "i686-linux" then ''

2
pkgs/development/compilers/yosys/default.nix
View file

@ -56,7 +56,7 @@ let
in lib.appendToName "with-plugins" ( symlinkJoin {
inherit (yosys) name;
paths = paths ++ [ yosys ] ;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/yosys \
--set NIX_YOSYS_PLUGIN_DIRS $out/share/yosys/plugins \

2
pkgs/development/idris-modules/idris-wrapper.nix
View file

@ -3,7 +3,7 @@
symlinkJoin {
inherit (idris-no-deps) name src meta;
paths = [ idris-no-deps ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/idris \
--run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.cc}/bin/cc}' \

2
pkgs/development/idris-modules/with-packages.nix
View file

@ -10,7 +10,7 @@ lib.appendToName "with-packages" (symlinkJoin {
paths = paths ++ [idris] ;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/idris \

2
pkgs/development/interpreters/lfe/generic-builder.nix
View file

@ -37,7 +37,7 @@ buildRebar3 {
inherit src version;
buildInputs = [ erlang makeWrapper ];
nativeBuildInputs = [ makeWrapper erlang ];
beamDeps = [ proper ];
patches = [ ./fix-rebar-config.patch ./dedup-ebins.patch ] ++ patches;
doCheck = true;

4
pkgs/development/interpreters/maude/default.nix
View file

@ -22,9 +22,9 @@ stdenv.mkDerivation {
sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f";
};
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [ flex bison unzip makeWrapper ];
buildInputs = [
flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper cln yices
ncurses buddy tecla gmpxx libsigsegv cln yices
];
hardeningDisable = [ "stackprotector" ] ++

2
pkgs/development/libraries/aspell/aspell-with-dicts.nix
View file

@ -19,7 +19,7 @@ let
in buildEnv {
name = "aspell-env";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
paths = [ aspell ] ++ dicts;
postBuild = ''
# Construct wrappers in /bin

2
pkgs/development/libraries/gsignond/wrapper.nix
View file

@ -5,7 +5,7 @@ symlinkJoin {
paths = [ gsignond ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/gsignond \

2
pkgs/development/libraries/vapoursynth/editor.nix
View file

@ -45,7 +45,7 @@ let
withPlugins = plugins: let
vapoursynthWithPlugins = vapoursynth.withPlugins plugins;
in runCommand "${unwrapped.name}-with-plugins" {
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); };
} ''
mkdir -p $out/bin

3
pkgs/development/lisp-modules-new/packages.nix
View file

@ -309,9 +309,8 @@ let
sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b";
};
nativeBuildInputs = [ pkgs.makeWrapper ];
buildInputs = [
pkgs.makeWrapper
# needed for GSETTINGS_SCHEMAS_PATH
pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3

5
pkgs/development/mobile/androidenv/build-tools.nix
View file

@ -2,8 +2,9 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ makeWrapper ] ++
lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ];
nativeBuildInputs = [ makeWrapper ]
++ lib.optionals (os == "linux") [ autoPatchelfHook ];
buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ];
patchInstructions = ''
${lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib

6
pkgs/development/mobile/androidenv/emulator.nix
View file

@ -2,9 +2,9 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ makeWrapper ]
++ lib.optionals (os == "linux") (with pkgs; [
autoPatchelfHook
nativeBuildInputs = [ makeWrapper ]
++ lib.optionals (os == "linux") [ autoPatchelfHook ];
buildInputs = lib.optionals (os == "linux") (with pkgs; [
glibc
libcxx
libGL

4
pkgs/development/mobile/androidenv/tools/25.nix
View file

@ -2,8 +2,8 @@
deployAndroidPackage {
name = "androidsdk";
buildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ];
inherit package os;
patchInstructions = ''

7
pkgs/development/mobile/androidenv/tools/26.nix
View file

@ -3,9 +3,10 @@
deployAndroidPackage {
name = "androidsdk";
inherit os package;
buildInputs = [ makeWrapper ]
++ lib.optional (os == "linux") (
(with pkgs; [ autoPatchelfHook glibc freetype fontconfig fontconfig.lib])
nativeBuildInputs = [ makeWrapper ]
++ lib.optionals (os == "linux") [ autoPatchelfHook ];
buildInputs = lib.optional (os == "linux") (
(with pkgs; [ glibc freetype fontconfig fontconfig.lib])
++ (with pkgs.xorg; [ libX11 libXrender libXext ])
++ (with pkgs_i686; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ])
);

2
pkgs/development/python-modules/gtimelog/default.nix
View file

@ -15,8 +15,8 @@ buildPythonPackage rec {
sha256 = "0qv2kv7vc3qqlzxsisgg31cmrkkqgnmxspbj10c5fhdmwzzwi0i9";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
makeWrapper
glibcLocales gobject-introspection gtk3 libsoup libsecret
];

2
pkgs/development/tools/build-managers/msbuild/default.nix
View file

@ -36,12 +36,12 @@ stdenv.mkDerivation rec {
dotnet-sdk
mono
unzip
makeWrapper
];
buildInputs = [
dotnetPackages.Nuget
glibcLocales
makeWrapper
];
# https://github.com/NixOS/nixpkgs/issues/38991

3
pkgs/development/tools/eclipse-mat/default.nix
View file

@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png
'';
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [ unzip makeWrapper ];
buildInputs = [
fontconfig
freetype
@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
libX11
libXrender
libXtst
makeWrapper
zlib
shared-mime-info
webkitgtk

2
pkgs/development/tools/haskell/ihaskell/wrapper.nix
View file

@ -14,7 +14,7 @@ let
in
buildEnv {
name = "ihaskell-with-packages";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
paths = [ ihaskellEnv jupyter ];
postBuild = ''
ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/

3
pkgs/development/web/wml/default.nix
View file

@ -23,8 +23,9 @@ perlPackages.buildPerlPackage {
sed -i '/p2_mp4h\/doc/d' Makefile.in
'';
nativeBuildInputs = [ makeWrapper ];
buildInputs = with perlPackages;
[ perl TermReadKey GD BitVector ncurses lynx makeWrapper ImageSize ];
[ perl TermReadKey GD BitVector ncurses lynx ImageSize ];
patches = [ ./redhat-with-thr.patch ./dynaloader.patch ./no_bitvector.patch ];

2
pkgs/games/frogatto/default.nix
View file

@ -18,7 +18,7 @@ let
in buildEnv {
name = "frogatto-${version}";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
paths = [ engine data desktopItem ];
pathsToLink = [
"/bin"

6
pkgs/games/megaglest/default.nix
View file

@ -37,9 +37,9 @@ stdenv.mkDerivation {
})
];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK
glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ];
nativeBuildInputs = [ cmake pkg-config makeWrapper git ];
buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK
glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ];
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=$out"

3
pkgs/games/nanosaur/default.nix
View file

@ -12,10 +12,9 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [
SDL2
makeWrapper
];
configurePhase = ''

3
pkgs/games/space-cadet-pinball/default.nix
View file

@ -33,11 +33,10 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [
SDL2
SDL2_mixer
makeWrapper
] ++ lib.optional stdenv.isDarwin Cocoa;
# Darwin needs a custom installphase since it is excluded from the cmake install

3
pkgs/games/stuntrally/default.nix
View file

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
ln -s ${tracks} data/tracks
'';
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
boost
ogre
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
ois
SDL2
libvorbis
makeWrapper
enet
libXcursor
bullet

4
pkgs/games/xconq/default.nix
View file

@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca";
};
buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext
fontconfig makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext fontconfig ];
configureFlags = [
"--enable-alternate-scoresdir=scores"

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

@ -21,8 +21,8 @@ perlPackages.buildPerlPackage rec {
hash = "sha256-P4CSu/ff6i48uWV5gXsJgayZ1S1s0RAqa5O5y3Y0g9Y=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
makeWrapper
perlPackages.perl
perlPackages.AnyEvent
perlPackages.ArchiveZip

2
pkgs/servers/sql/postgresql/default.nix
View file

@ -176,7 +176,7 @@ let
postgresql.lib
postgresql.man # in case user installs this into environment
];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# We include /bin to ensure the $out/bin directory is created, which is

4
pkgs/servers/web-apps/discourse/mail_receiver/default.nix
View file

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0grifm5qyqazq63va3w26xjqnxwmfixhx0fx0zy7kd39378wwa6i";
};
nativeBuildInputs = [ replace ];
buildInputs = [ ruby makeWrapper ];
nativeBuildInputs = [ replace makeWrapper ];
buildInputs = [ ruby ];
dontBuild = true;

4
pkgs/tools/audio/gvolicon/default.nix
View file

@ -11,9 +11,9 @@ stdenv.mkDerivation {
sha256 = "sha256-lm5OfryV1/1T1RgsVDdp0Jg5rh8AND8M3ighfrznKes=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [
makeWrapper alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme
alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme
librsvg wrapGAppsHook
];

2
pkgs/tools/backup/lvmsync/default.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "lvmsync";
version = (import ./gemset.nix).${pname}.version;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
dontUnpack = true;

8
pkgs/tools/filesystems/glusterfs/default.nix
View file

@ -14,9 +14,9 @@ let
# can help with finding new Python scripts.
buildInputs = [
fuse bison flex openssl ncurses readline
libtool pkg-config zlib libaio libxml2
acl sqlite liburcu attr makeWrapper util-linux libtirpc gperftools
fuse openssl ncurses readline
zlib libaio libxml2
acl sqlite liburcu attr util-linux libtirpc gperftools
liburing
(python3.withPackages (pkgs: [
pkgs.flask
@ -106,7 +106,7 @@ in stdenv.mkDerivation rec {
"--localstatedir=/var"
];
nativeBuildInputs = [ rpcsvc-proto autoconf automake ];
nativeBuildInputs = [ autoconf automake libtool pkg-config bison flex makeWrapper rpcsvc-proto ];
makeFlags = [ "DESTDIR=$(out)" ];

8
pkgs/tools/networking/dd-agent/5.nix
View file

@ -49,10 +49,8 @@ in stdenv.mkDerivation rec {
patches = [ ./40103-iostat-fix.patch ];
nativeBuildInputs = [ unzip ];
buildInputs = [
makeWrapper
] ++ (with python'.pkgs; [
nativeBuildInputs = [ unzip makeWrapper ];
buildInputs = with python'.pkgs; [
requests
psycopg2
psutil
@ -63,7 +61,7 @@ in stdenv.mkDerivation rec {
python-etcd
consul
docker
]);
];
propagatedBuildInputs = with python'.pkgs; [ python tornado ];
buildCommand = ''

3
pkgs/tools/security/pass/default.nix
View file

@ -33,7 +33,8 @@ let
in buildEnv {
name = "pass-extensions-env";
paths = selected;
buildInputs = [ makeWrapper ] ++ concatMap (x: x.buildInputs) selected;
nativeBuildInputs = [ makeWrapper ];
buildInputs = concatMap (x: x.buildInputs) selected;
postBuild = ''
files=$(find $out/bin/ -type f -exec readlink -f {} \;)