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

Merge pull request #186564 from Artturin/crossevalfixes

Browse Source 
Fixes for cross-compilation
This commit is contained in:
Artturi 2022-08-27 17:49:00 +03:00 committed by GitHub
commit 79c42aa06c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
82 changed files with 149 additions and 158 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" ]; categories = [ "Development" ];
}; };
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ buildInputs = [
fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11
libXrender libXtst libsecret makeWrapper zlib libXrender libXtst libsecret zlib
] ++ lib.optional (webkitgtk != null) webkitgtk; ] ++ lib.optional (webkitgtk != null) webkitgtk;
buildCommand = '' buildCommand = ''

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

@ -22,7 +22,7 @@ rec {
launcher = runCommand "octave-kernel-launcher" { launcher = runCommand "octave-kernel-launcher" {
inherit octave; inherit octave;
python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]); python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]);
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
} '' } ''
mkdir -p $out/bin 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 if vimrcFile != null then vimrcFile
else if vimrcConfig != null then mkVimrcFile vimrcConfig else if vimrcConfig != null then mkVimrcFile vimrcConfig
else throw "at least one of vimrcConfig and vimrcFile must be specified"; 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} vimrc=${lib.escapeShellArg vimrc}
gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""} gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""}

5
pkgs/applications/emulators/cdemu/analyzer.nix
View File

@ -6,11 +6,10 @@ let pkg = import ./base.nix {
pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc"; pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
}; };
in callPackage pkg { in callPackage pkg {
buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper buildInputs = [ glib gtk3 libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg
gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool
python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
drvParams = { drvParams = {
nativeBuildInputs = [ gobject-introspection cmake ]; nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
postFixup = '' postFixup = ''
wrapProgram $out/bin/image-analyzer \ wrapProgram $out/bin/image-analyzer \
--set PYTHONPATH "$PYTHONPATH" \ --set PYTHONPATH "$PYTHONPATH" \

4
pkgs/applications/emulators/cdemu/base.nix
View File

@ -1,12 +1,12 @@
{ pname, version, pkgSha256 }: { pname, version, pkgSha256 }:
{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: attrs@{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {}, ... }:
stdenv.mkDerivation ( rec { stdenv.mkDerivation ( rec {
inherit pname version buildInputs; inherit pname version buildInputs;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz"; url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
sha256 = pkgSha256; sha256 = pkgSha256;
}; };
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkg-config cmake ];
setSourceRoot = '' setSourceRoot = ''
mkdir build mkdir build
cd build cd build

4
pkgs/applications/emulators/cdemu/client.nix
View File

@ -5,8 +5,8 @@ let pkg = import ./base.nix {
pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7"; pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
}; };
in callPackage pkg { in callPackage pkg {
buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 nativeBuildInputs = [ makeWrapper intltool ];
intltool makeWrapper ]; buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 ];
drvParams = { drvParams = {
postFixup = '' postFixup = ''
wrapProgram $out/bin/cdemu \ wrapProgram $out/bin/cdemu \

3
pkgs/applications/emulators/cdemu/daemon.nix
View File

@ -5,5 +5,6 @@ let pkg = import ./base.nix {
pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d"; pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
}; };
in callPackage pkg { in callPackage pkg {
buildInputs = [ glib libao libmirage intltool ]; nativeBuildInputs = [ intltool ];
buildInputs = [ glib libao libmirage ];
} }

5
pkgs/applications/emulators/cdemu/gui.nix
View File

@ -8,10 +8,9 @@ let
}; };
inherit (python3Packages) python pygobject3; inherit (python3Packages) python pygobject3;
in callPackage pkg { in callPackage pkg {
buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper buildInputs = [ python pygobject3 gtk3 glib libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
drvParams = { drvParams = {
nativeBuildInputs = [ gobject-introspection cmake ]; nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
postFixup = '' postFixup = ''
wrapProgram $out/bin/gcdemu \ wrapProgram $out/bin/gcdemu \
--set PYTHONPATH "$PYTHONPATH" \ --set PYTHONPATH "$PYTHONPATH" \

4
pkgs/applications/emulators/cdemu/libmirage.nix
View File

@ -8,11 +8,11 @@ let pkg = import ./base.nix {
pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm"; pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
}; };
in callPackage pkg { in callPackage pkg {
buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ]; buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ];
drvParams = { drvParams = {
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
nativeBuildInputs = [ cmake gobject-introspection pkg-config ]; nativeBuildInputs = [ cmake gobject-introspection pkg-config intltool ];
propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
}; };
} }

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

@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4="; sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite 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 ] libLAS proj-datumgrid zstd wrapGAppsHook ]
++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK31 ] ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK31 ]
++ lib.optional stdenv.isDarwin wxmac ++ lib.optional stdenv.isDarwin wxmac

2
pkgs/applications/graphics/image_optim/default.nix
View File

@ -35,7 +35,7 @@ bundlerApp {
exes = [ "image_optim" ]; exes = [ "image_optim" ];
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
wrapProgram $out/bin/image_optim \ wrapProgram $out/bin/image_optim \

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 wrapProgram $out/bin/timelapse-deflicker --set PERL5LIB $PERL5LIB
''; '';
nativeBuildInputs = [ makeWrapper ];
buildInputs = with perlPackages; [ buildInputs = with perlPackages; [
makeWrapper perl perl
ImageMagick TermProgressBar ImageExifTool ImageMagick TermProgressBar ImageExifTool
FileType ClassMethodMaker FileType ClassMethodMaker
]; ];

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

@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm"; sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff 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 # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the
# trick on NIX_LDFLAGS and dontPatchELF to make it find them. # trick on NIX_LDFLAGS and dontPatchELF to make it find them.

2
pkgs/applications/misc/gollum/default.nix
View File

@ -7,7 +7,7 @@ bundlerApp rec {
inherit ruby; inherit ruby;
gemdir = ./.; gemdir = ./.;
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
passthru.updateScript = bundlerUpdateScript "gollum"; passthru.updateScript = bundlerUpdateScript "gollum";

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

@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr"; sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
}; };
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ which highlight ] buildInputs = [ which highlight ]
++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate ++ (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 RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]) NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ])
++ lib.optionals docutilsSupport [ ++ lib.optionals docutilsSupport [

2
pkgs/applications/misc/jekyll/default.nix
View File

@ -30,7 +30,7 @@ in bundlerApp {
then ./full then ./full
else ./basic; else ./basic;
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin

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 # LaTeX is used from $PATH, as people often want to have it with extra pkgs
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ buildInputs = [
qtbase qtsvg python3 file/*for libmagic*/ bc qtbase qtsvg python3 file/*for libmagic*/ bc
hunspell makeWrapper # enchant hunspell # enchant
]; ];
configureFlags = [ 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"; preConfigure = "./autogen.sh --libexecdir=$(out)/bin";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config makeWrapper libtool ];
buildInputs = [ buildInputs = [
glib libwnck libnotify dbus-glib makeWrapper glib libwnck libnotify dbus-glib
gsettings-desktop-schemas gnome.gnome-common gsettings-desktop-schemas gnome.gnome-common
libtool
]; ];
configureFlags = [ "--libexecdir=$(out)/bin" ]; configureFlags = [ "--libexecdir=$(out)/bin" ];

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

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

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

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

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

@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0="; sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
}; };
nativeBuildInputs = [ makeWrapper which ];
buildInputs = buildInputs =
[boost] ++ [boost] ++
(with perlPackages; [ perl makeWrapper which (with perlPackages; [ perl
EncodeLocale MathClipper ExtUtilsXSpp EncodeLocale MathClipper ExtUtilsXSpp
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX 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="; sha256 = "sha256-IWHj//ZZOdfOCBJHnPnKNoYNtWl/f8H6ARYe1AkqB0U=";
}; };
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
dontUnpack = true; dontUnpack = true;
dontBuild = true; dontBuild = true;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -28,8 +28,8 @@ stdenv.mkDerivation {
pname = "sage-tests"; pname = "sage-tests";
inherit src; inherit src;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ buildInputs = [
makeWrapper
sage-with-env 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 let
buildInputs = [ buildInputs = [
pythonEnv # for patchShebangs pythonEnv # for patchShebangs
makeWrapper
pkg-config pkg-config
blas lapack blas lapack
singular 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 )); transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs ));
# fix differences between spkg and sage names # fix differences between spkg and sage names
# (could patch sage instead, but this is more lightweight and also works for packages depending on sage) # (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"; pname = "sage";
src = sage-with-env.env.lib.src; src = sage-with-env.env.lib.src;
buildInputs = [ nativeBuildInputs = [ makeWrapper ];
makeWrapper buildInputs = lib.optionals requireSageTests [
] ++ lib.optionals requireSageTests [
# This is a hack to make sure sage-tests is evaluated. It doesn't acutally # 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. # produce anything of value, it just decouples the tests from the build.
sage-tests sage-tests

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

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

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

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

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

@ -38,11 +38,11 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = nativeBuildInputs =
[ yasm cmake pkg-config ] [ yasm cmake pkg-config makeWrapper ]
++ lib.optional withQT wrapQtAppsHook; ++ lib.optional withQT wrapQtAppsHook;
buildInputs = [ buildInputs = [
zlib gettext libvdpau libva libXv sqlite fribidi fontconfig 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 withX264 x264
++ lib.optional withX265 x265 ++ lib.optional withX265 x265
++ lib.optional withXvid xvidcore ++ 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="; sha256 = "sha256-LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k=";
}; };
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake makeWrapper libtool ];
buildInputs = [
libtool
makeWrapper
];
propagatedBuildInputs = [ propagatedBuildInputs = [
libffi libffi
gmp gmp

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

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

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

@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ]; configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ];
buildInputs = [ which perl jdk openssl coreutils zlib ncurses nativeBuildInputs = [ gcc binutils nodejs which makeWrapper ];
makeWrapper gcc binutils gnumake nodejs buildInputs = [ perl jdk openssl coreutils zlib ncurses
] ++ (with ocamlPackages; [ ] ++ (with ocamlPackages; [
ocaml findlib ssl camlzip ulex ocamlgraph camlp4 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 ]; paths = [ open-watcom ];
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
mkdir $out/bin mkdir $out/bin

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

@ -13,8 +13,9 @@ stdenv.mkDerivation {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ makeWrapper autoconf automake ];
buildInputs = (if stdenv.hostPlatform.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ 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 '' 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 { in lib.appendToName "with-plugins" ( symlinkJoin {
inherit (yosys) name; inherit (yosys) name;
paths = paths ++ [ yosys ] ; paths = paths ++ [ yosys ] ;
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
wrapProgram $out/bin/yosys \ wrapProgram $out/bin/yosys \
--set NIX_YOSYS_PLUGIN_DIRS $out/share/yosys/plugins \ --set NIX_YOSYS_PLUGIN_DIRS $out/share/yosys/plugins \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -2,8 +2,8 @@
deployAndroidPackage { deployAndroidPackage {
name = "androidsdk"; name = "androidsdk";
buildInputs = [ autoPatchelfHook makeWrapper ] nativeBuildInputs = [ 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 ]; 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; inherit package os;
patchInstructions = '' patchInstructions = ''

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

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

44
pkgs/development/node-packages/overrides.nix
View File

@ -39,7 +39,7 @@ final: prev: {
}; };
"@hyperspace/cli" = prev."@hyperspace/cli".override { "@hyperspace/cli" = prev."@hyperspace/cli".override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
buildInputs = [ final.node-gyp-build ]; buildInputs = [ final.node-gyp-build ];
postInstall = ''wrapProgram "$out/bin/hyp" --prefix PATH : ${ lib.makeBinPath [ nodejs ] }''; postInstall = ''wrapProgram "$out/bin/hyp" --prefix PATH : ${ lib.makeBinPath [ nodejs ] }'';
}; };
@ -63,7 +63,7 @@ final: prev: {
mdctl-cli = final."@medable/mdctl-cli"; mdctl-cli = final."@medable/mdctl-cli";
autoprefixer = prev.autoprefixer.override { autoprefixer = prev.autoprefixer.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/autoprefixer" \ wrapProgram "$out/bin/autoprefixer" \
--prefix NODE_PATH : ${final.postcss}/lib/node_modules --prefix NODE_PATH : ${final.postcss}/lib/node_modules
@ -74,7 +74,7 @@ final: prev: {
}; };
aws-azure-login = prev.aws-azure-login.override (oldAttrs: { aws-azure-login = prev.aws-azure-login.override (oldAttrs: {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
prePatch = '' prePatch = ''
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
''; '';
@ -100,7 +100,7 @@ final: prev: {
}; };
bower2nix = prev.bower2nix.override { bower2nix = prev.bower2nix.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
for prog in bower2nix fetch-bower; do for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ pkgs.git pkgs.nix ]} wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ pkgs.git pkgs.nix ]}
@ -109,7 +109,7 @@ final: prev: {
}; };
carbon-now-cli = prev.carbon-now-cli.override { carbon-now-cli = prev.carbon-now-cli.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
prePatch = '' prePatch = ''
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
''; '';
@ -151,7 +151,7 @@ final: prev: {
}); });
fast-cli = prev.fast-cli.override { fast-cli = prev.fast-cli.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
prePatch = '' prePatch = ''
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
''; '';
@ -171,7 +171,7 @@ final: prev: {
}); });
graphql-language-service-cli = prev.graphql-language-service-cli.override { graphql-language-service-cli = prev.graphql-language-service-cli.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/graphql-lsp" \ wrapProgram "$out/bin/graphql-lsp" \
--prefix NODE_PATH : ${final.graphql}/lib/node_modules --prefix NODE_PATH : ${final.graphql}/lib/node_modules
@ -227,7 +227,7 @@ final: prev: {
}; };
makam = prev.makam.override { makam = prev.makam.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postFixup = '' postFixup = ''
wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]} wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]}
${ ${
@ -255,7 +255,7 @@ final: prev: {
if stdenv.isDarwin if stdenv.isDarwin
then {} then {}
else { else {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
prePatch = '' prePatch = ''
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
''; '';
@ -275,7 +275,7 @@ final: prev: {
}; };
node-gyp = prev.node-gyp.override { node-gyp = prev.node-gyp.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
# Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org. # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org.
# This is important when build nodejs packages in sandbox. # This is important when build nodejs packages in sandbox.
postInstall = '' postInstall = ''
@ -294,7 +294,7 @@ final: prev: {
}; };
node2nix = prev.node2nix.override { node2nix = prev.node2nix.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
# We need to use master because of a fix that replaces git:// url to https://. # We need to use master because of a fix that replaces git:// url to https://.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "svanderburg"; owner = "svanderburg";
@ -316,7 +316,7 @@ final: prev: {
}; };
pnpm = prev.pnpm.override { pnpm = prev.pnpm.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
preRebuild = '' preRebuild = ''
sed 's/"link:/"file:/g' --in-place package.json sed 's/"link:/"file:/g' --in-place package.json
@ -335,7 +335,7 @@ final: prev: {
}; };
postcss-cli = prev.postcss-cli.override (oldAttrs: { postcss-cli = prev.postcss-cli.override (oldAttrs: {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/postcss" \ wrapProgram "$out/bin/postcss" \
--prefix NODE_PATH : ${final.postcss}/lib/node_modules \ --prefix NODE_PATH : ${final.postcss}/lib/node_modules \
@ -354,7 +354,7 @@ final: prev: {
# version. Then change the correct hash to this package. The PR should hold # version. Then change the correct hash to this package. The PR should hold
# two commits: one for the engines and the other one for the node package. # two commits: one for the engines and the other one for the node package.
prisma = prev.prisma.override rec { prisma = prev.prisma.override rec {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
inherit (pkgs.prisma-engines) version; inherit (pkgs.prisma-engines) version;
@ -382,7 +382,7 @@ final: prev: {
# tries to install purescript # tries to install purescript
npmFlags = "--ignore-scripts"; npmFlags = "--ignore-scripts";
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/pulp" --suffix PATH : ${lib.makeBinPath [ wrapProgram "$out/bin/pulp" --suffix PATH : ${lib.makeBinPath [
pkgs.purescript pkgs.purescript
@ -392,7 +392,7 @@ final: prev: {
reveal-md = prev.reveal-md.override ( reveal-md = prev.reveal-md.override (
lib.optionalAttrs (!stdenv.isDarwin) { lib.optionalAttrs (!stdenv.isDarwin) {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
prePatch = '' prePatch = ''
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
''; '';
@ -414,7 +414,7 @@ final: prev: {
tailwindcss = prev.tailwindcss.override { tailwindcss = prev.tailwindcss.override {
plugins = [ ]; plugins = [ ];
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
nodePath="" nodePath=""
for p in "$out" "${final.postcss}" $plugins; do for p in "$out" "${final.postcss}" $plugins; do
@ -439,7 +439,7 @@ final: prev: {
}; };
tedicross = prev."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override { tedicross = prev."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \ makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
--add-flags "$out/lib/node_modules/tedicross/main.js" --add-flags "$out/lib/node_modules/tedicross/main.js"
@ -480,7 +480,7 @@ final: prev: {
}; };
ts-node = prev.ts-node.override { ts-node = prev.ts-node.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/ts-node" \ wrapProgram "$out/bin/ts-node" \
--prefix NODE_PATH : ${final.typescript}/lib/node_modules --prefix NODE_PATH : ${final.typescript}/lib/node_modules
@ -488,7 +488,7 @@ final: prev: {
}; };
tsun = prev.tsun.override { tsun = prev.tsun.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/tsun" \ wrapProgram "$out/bin/tsun" \
--prefix NODE_PATH : ${final.typescript}/lib/node_modules --prefix NODE_PATH : ${final.typescript}/lib/node_modules
@ -496,7 +496,7 @@ final: prev: {
}; };
typescript-language-server = prev.typescript-language-server.override { typescript-language-server = prev.typescript-language-server.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/typescript-language-server" \ wrapProgram "$out/bin/typescript-language-server" \
--suffix PATH : ${lib.makeBinPath [ final.typescript ]} --suffix PATH : ${lib.makeBinPath [ final.typescript ]}
@ -554,7 +554,7 @@ final: prev: {
}; };
yaml-language-server = prev.yaml-language-server.override { yaml-language-server = prev.yaml-language-server.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/yaml-language-server" \ wrapProgram "$out/bin/yaml-language-server" \
--prefix NODE_PATH : ${final.prettier}/lib/node_modules --prefix NODE_PATH : ${final.prettier}/lib/node_modules

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

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

3
pkgs/development/ruby-modules/bundled-common/default.nix
View File

@ -20,6 +20,7 @@
, meta ? {} , meta ? {}
, groups ? null , groups ? null
, ignoreCollisions ? false , ignoreCollisions ? false
, nativeBuildInputs ? []
, buildInputs ? [] , buildInputs ? []
, extraConfigPaths ? [] , extraConfigPaths ? []
, ... , ...
@ -102,7 +103,7 @@ let
basicEnvArgs = { basicEnvArgs = {
inherit buildInputs ignoreCollisions; inherit nativeBuildInputs buildInputs ignoreCollisions;
name = name'; name = name';

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

@ -36,12 +36,12 @@ stdenv.mkDerivation rec {
dotnet-sdk dotnet-sdk
mono mono
unzip unzip
makeWrapper
]; ];
buildInputs = [ buildInputs = [
dotnetPackages.Nuget dotnetPackages.Nuget
glibcLocales glibcLocales
makeWrapper
]; ];
# https://github.com/NixOS/nixpkgs/issues/38991 # 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 mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png
''; '';
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip makeWrapper ];
buildInputs = [ buildInputs = [
fontconfig fontconfig
freetype freetype
@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
libX11 libX11
libXrender libXrender
libXtst libXtst
makeWrapper
zlib zlib
shared-mime-info shared-mime-info
webkitgtk webkitgtk

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

@ -14,7 +14,7 @@ let
in in
buildEnv { buildEnv {
name = "ihaskell-with-packages"; name = "ihaskell-with-packages";
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
paths = [ ihaskellEnv jupyter ]; paths = [ ihaskellEnv jupyter ];
postBuild = '' postBuild = ''
ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/ 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 sed -i '/p2_mp4h\/doc/d' Makefile.in
''; '';
nativeBuildInputs = [ makeWrapper ];
buildInputs = with perlPackages; 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 ]; 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 { in buildEnv {
name = "frogatto-${version}"; name = "frogatto-${version}";
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
paths = [ engine data desktopItem ]; paths = [ engine data desktopItem ];
pathsToLink = [ pathsToLink = [
"/bin" "/bin"

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

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

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

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

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

@ -33,11 +33,10 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ buildInputs = [
SDL2 SDL2
SDL2_mixer SDL2_mixer
makeWrapper
] ++ lib.optional stdenv.isDarwin Cocoa; ] ++ lib.optional stdenv.isDarwin Cocoa;
# Darwin needs a custom installphase since it is excluded from the cmake install # 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 ln -s ${tracks} data/tracks
''; '';
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [ buildInputs = [
boost boost
ogre ogre
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
ois ois
SDL2 SDL2
libvorbis libvorbis
makeWrapper
enet enet
libXcursor libXcursor
bullet bullet

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

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

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

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

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

@ -176,7 +176,7 @@ let
postgresql.lib postgresql.lib
postgresql.man # in case user installs this into environment 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 # 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"; sha256 = "0grifm5qyqazq63va3w26xjqnxwmfixhx0fx0zy7kd39378wwa6i";
}; };
nativeBuildInputs = [ replace ]; nativeBuildInputs = [ replace makeWrapper ];
buildInputs = [ ruby makeWrapper ]; buildInputs = [ ruby ];
dontBuild = true; dontBuild = true;

2
pkgs/tools/admin/puppet/puppet-bolt/default.nix
View File

@ -5,7 +5,7 @@ bundlerApp {
gemdir = ./.; gemdir = ./.;
exes = [ "bolt" ]; exes = [ "bolt" ];
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
gemConfig.bolt = attrs: { gemConfig.bolt = attrs: {
# scripts in libexec will be executed by remote host, # scripts in libexec will be executed by remote host,

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

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

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

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

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

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

2
pkgs/tools/inputmethods/fusuma/default.nix
View File

@ -5,7 +5,7 @@ bundlerApp {
gemdir = ./.; gemdir = ./.;
exes = [ "fusuma" ]; exes = [ "fusuma" ];
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
wrapProgram "$out/bin/fusuma" \ wrapProgram "$out/bin/fusuma" \

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

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

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

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

4
pkgs/tools/security/wpscan/default.nix
View File

@ -9,9 +9,7 @@ bundlerApp {
gemdir = ./.; gemdir = ./.;
exes = [ "wpscan" ]; exes = [ "wpscan" ];
buildInputs = [ nativeBuildInputs = [ makeWrapper ];
makeWrapper
];
postBuild = '' postBuild = ''
wrapProgram "$out/bin/wpscan" \ wrapProgram "$out/bin/wpscan" \

2
pkgs/tools/system/r10k/default.nix
View File

@ -5,7 +5,7 @@ bundlerApp {
gemdir = ./.; gemdir = ./.;
exes = [ "r10k" ]; exes = [ "r10k" ];
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]}

2
pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
View File

@ -20,7 +20,7 @@ bundlerApp rec {
"asciidoctor-revealjs" "asciidoctor-revealjs"
]; ];
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = lib.optionalString (path != "") (lib.concatMapStrings (exe: '' postBuild = lib.optionalString (path != "") (lib.concatMapStrings (exe: ''
wrapProgram $out/bin/${exe} \ wrapProgram $out/bin/${exe} \

2
pkgs/tools/typesetting/kramdown-asciidoc/default.nix
View File

@ -13,7 +13,7 @@ let
"kramdoc" "kramdoc"
]; ];
# buildInputs = [ makeWrapper ]; # nativeBuildInputs = [ makeWrapper ];
# postBuild = '' # postBuild = ''
# wrapProgram "$out/bin/asciidoctor-epub3" \ # wrapProgram "$out/bin/asciidoctor-epub3" \

2
pkgs/top-level/all-packages.nix
View File

@ -3148,7 +3148,7 @@ with pkgs;
cabal2nix = symlinkJoin { cabal2nix = symlinkJoin {
inherit (cabal2nix-unwrapped) name meta; inherit (cabal2nix-unwrapped) name meta;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ buildPackages.makeWrapper ];
paths = [ cabal2nix-unwrapped ]; paths = [ cabal2nix-unwrapped ];
postBuild = '' postBuild = ''
wrapProgram $out/bin/cabal2nix \ wrapProgram $out/bin/cabal2nix \