diff options
Diffstat (limited to 'pkgs/applications')
26 files changed, 40 insertions, 40 deletions
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 19a2e378f30a7..d2a0080859da1 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -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 = '' diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 7a1c997a7c53c..8a6dc4e00730c 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -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 diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index d11d638f4a02a..c80dcb80949a2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -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 ""} diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 8ec293e489a70..8cc7caee67433 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -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 diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix index c752d7e3f7180..f1757d51b1b38 100644 --- a/pkgs/applications/graphics/timelapse-deflicker/default.nix +++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 65a74c4aca48b..285c5270948d1 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -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. diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index af7e9888c17cb..09f9b85e4b71b 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -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 [ diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index e736c235c457c..d1a19eeccc5e3 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -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 = [ diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 820eceabb511f..17377c6dae55f 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -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" ]; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 005d0273466ca..9c0c5a3921efb 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 6f858c8c6a9de..7797b6dccac0f 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + makeWrapper ]; buildInputs = [ cairo glib libnotify - makeWrapper rofi-unwrapped wl-clipboard xclip diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 8d929e0eef58c..f973cf591593e 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -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 diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index 0b0163b054d7d..ebd266e666989 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-IWHj//ZZOdfOCBJHnPnKNoYNtWl/f8H6ARYe1AkqB0U="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontUnpack = true; dontBuild = true; diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 8f6d2712caaf7..cb11708fbee09 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy"; }; - buildInputs = [ makeWrapper ] ++ otherDependencies ++ pythonDependencies; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = otherDependencies ++ pythonDependencies; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index 33f3b90873d76..5dc09ae1f3eec 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl - makeWrapper ]; propagatedBuildInputs = with perlPackages; [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index d5641c24fb07a..a2885d7194f4b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -7,7 +7,7 @@ in symlinkJoin { paths = [ pidgin ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/pidgin \ diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index dd4e104aa66ab..cebc1f9eb423d 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -137,7 +137,7 @@ let hash = "sha256-vLUEvOSBUyAJIWHOAIkTqTW/W6TkgmeyRzQbquZP810="; }; - buildInputs = [ xar cpio makeWrapper ]; + nativeBuildInputs = [ xar cpio makeWrapper ]; unpackPhase = '' xar -xf $src diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index ffd30c754b47e..4cd9706bdb973 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { dontStrip = true; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl - makeWrapper ] ++ (with perlPackages; [ FileRemove DigestSHA1 diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 2018878773ef0..1cd23d0f414d7 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -32,10 +32,7 @@ let ]; } // (attrs.meta or {}); - buildInputs = [ - dpkg - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper dpkg ]; libs = attrs.libs or [ atk diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 6e9ff90315cd1..dbc5c8a0f1799 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -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; diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 451edb8f085eb..79d4f78082e09 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation { pname = "sage-tests"; inherit src; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - makeWrapper sage-with-env ]; diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index df3a1467d53c9..23069f335b8fe 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -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) diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 87f3e1137b190..73776a74cdf9f 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -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 diff --git a/pkgs/applications/science/misc/openmodelica/combined/default.nix b/pkgs/applications/science/misc/openmodelica/combined/default.nix index 0c2220b7ea28d..bc6bc96202152 100644 --- a/pkgs/applications/science/misc/openmodelica/combined/default.nix +++ b/pkgs/applications/science/misc/openmodelica/combined/default.nix @@ -11,7 +11,7 @@ symlinkJoin { omshell ]; - buildInputs = [ gnumake makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/OMEdit \ diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 1175b42fc5dfb..8fae17774c0e8 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -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 = [ diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 35c628f8a59d8..e29b0a4880605 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -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 |