commit e03c068af5c9ca950214cd6c3b5cfe67f595da88 · pyrox.dev/nixpkgs

+2 -1

maintainers/scripts/nixpkgs-lint.nix

···

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "nixpkgs-lint-1";

     

       5
       5
        
       

     

       6
       6
       -
         buildInputs = [ makeWrapper perl perlPackages.XMLSimple ];

     

       6
       6
       +
         nativeBuildInputs = [ makeWrapper ];

     

       7
       7
       +
         buildInputs = [ perl perlPackages.XMLSimple ];

     

       7
       8
        
       

     

       8
       9
        
         dontUnpack = true;

     

       9
       10
        
         buildPhase = "true";

+2 -1

pkgs/applications/audio/MMA/default.nix

···

       9
       9
        
           sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper python3 alsaUtils timidity ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ python3 alsaUtils timidity ];

     

       13
       14
        
       

     

       14
       15
        
         patchPhase = ''

     

       15
       16
        
           sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec

+1 -1

pkgs/applications/audio/baudline/default.nix

···

       24
       24
        
           else

     

       25
       25
        
             throw "baudline isn't supported (yet?) on ${stdenv.hostPlatform.system}";

     

       26
       26
        
       

     

       27
       27
       -
         buildInputs = [ makeWrapper ];

     

       27
       27
       +
         nativeBuildInputs = [ makeWrapper ];

     

       28
       28
        
       

     

       29
       29
        
         # Prebuilt binary distribution.

     

       30
       30
        
         # "patchelf --set-rpath" seems to break the application (cannot start), using

+1 -1

pkgs/applications/audio/caudec/default.nix

···

       17
       17
        
           patchShebangs ./install.sh

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ bash makeWrapper ];

     

       20
       20
       +
         nativeBuildInputs = [ bash makeWrapper ];

     

       21
       21
        
       

     

       22
       22
        
         installPhase = ''

     

       23
       23
        
           ./install.sh --prefix=$out/bin

+3 -3

pkgs/applications/audio/clementine/default.nix

···

       24
       24
        
           ./clementine-spotify-blob.patch

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       27
       27
       +
         nativeBuildInputs = [ cmake pkg-config makeWrapper ];

     

       28
       28
        
       

     

       29
       29
        
         buildInputs = [

     

       30
       30
        
           boost

     
···

       68
       68
        
           inherit src patches nativeBuildInputs postPatch;

     

       69
       69
        
       

     

       70
       70
        
           # gst_plugins needed for setup-hooks

     

       71
       71
       -
           buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins;

     

       71
       71
       +
           buildInputs = buildInputs ++ gst_plugins;

     

       72
       72
        
       

     

       73
       73
        
           preConfigure = ''

     

       74
       74
        
             rm -rf ext/{,lib}clementine-spotifyblob

     
···

       102
       102
        
           # Use the same patches and sources as Clementine

     

       103
       103
        
           inherit src nativeBuildInputs patches postPatch;

     

       104
       104
        
       

     

       105
       105
       -
           buildInputs = buildInputs ++ [ libspotify makeWrapper ];

     

       105
       105
       +
           buildInputs = buildInputs ++ [ libspotify ];

     

       106
       106
        
           # Only build and install the Spotify blob

     

       107
       107
        
           preBuild = ''

     

       108
       108
        
             cd ext/clementine-spotifyblob

+2 -1

pkgs/applications/audio/clerk/default.nix

···

       11
       11
        
           sha256 = "0y045my65hr3hjyx13jrnyg6g3wb41phqb1m7azc4l6vx6r4124b";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper pythonPackages.mpd2 ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ pythonPackages.mpd2 ];

     

       15
       16
        
       

     

       16
       17
        
         dontBuild = true;

     

       17
       18

+1 -1

pkgs/applications/audio/deadbeef/wrapper.nix

···

       5
       5
        
       

     

       6
       6
        
         paths = [ deadbeef ] ++ plugins;

     

       7
       7
        
       

     

       8
       8
       -
         buildInputs = [ makeWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ makeWrapper ];

     

       9
       9
        
       

     

       10
       10
        
         postBuild = ''

     

       11
       11
        
           wrapProgram $out/bin/deadbeef \

+3 -4

pkgs/applications/audio/faust/faust1.nix

···

       30
       30
        
       

     

       31
       31
        
           inherit src;

     

       32
       32
        
       

     

       33
       33
       -
           buildInputs = [ makeWrapper ];

     

       33
       33
       +
           nativeBuildInputs = [ makeWrapper ];

     

       34
       34
        
       

     

       35
       35
        
           passthru = {

     

       36
       36
        
             inherit wrap wrapWithBuildEnv;

     
···

       159
       159
        
       

     

       160
       160
        
           stdenv.mkDerivation ((faust2ApplBase args) // {

     

       161
       161
        
       

     

       162
       162
       -
             nativeBuildInputs = [ pkg-config ];

     

       163
       163
       -
             buildInputs = [ makeWrapper ];

     

       162
       162
       +
             nativeBuildInputs = [ pkg-config makeWrapper ];

     

       164
       163
        
       

     

       165
       164
        
             propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;

     

       166
       165
        
       

     
···

       195
       194
        
       

     

       196
       195
        
           in stdenv.mkDerivation ((faust2ApplBase args) // {

     

       197
       196
        
       

     

       198
       198
       -
             buildInputs = [ makeWrapper ];

     

       197
       197
       +
             nativeBuildInputs = [ makeWrapper ];

     

       199
       198
        
       

     

       200
       199
        
             postFixup = ''

     

       201
       200
        
               for script in "$out"/bin/*; do

+2 -3

pkgs/applications/audio/faust/faust2.nix

···

       168
       168
        
       

     

       169
       169
        
           stdenv.mkDerivation ((faust2ApplBase args) // {

     

       170
       170
        
       

     

       171
       171
       -
             nativeBuildInputs = [ pkg-config ];

     

       172
       172
       -
             buildInputs = [ makeWrapper ];

     

       171
       171
       +
             nativeBuildInputs = [ pkg-config makeWrapper ];

     

       173
       172
        
       

     

       174
       173
        
             propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;

     

       175
       174
        
       

     
···

       209
       208
        
       

     

       210
       209
        
           in stdenv.mkDerivation ((faust2ApplBase args) // {

     

       211
       210
        
       

     

       212
       212
       -
             buildInputs = [ makeWrapper ];

     

       211
       211
       +
             nativeBuildInputs = [ makeWrapper ];

     

       213
       212
        
       

     

       214
       213
        
             postFixup = ''

     

       215
       214
        
               for script in "$out"/bin/*; do

+1 -1

pkgs/applications/audio/google-play-music-desktop-player/default.nix

···

       53
       53
        
         };

     

       54
       54
        
       

     

       55
       55
        
         dontBuild = true;

     

       56
       56
       -
         buildInputs = [ dpkg makeWrapper ];

     

       56
       56
       +
         nativeBuildInputs = [ dpkg makeWrapper ];

     

       57
       57
        
       

     

       58
       58
        
         unpackPhase = ''

     

       59
       59
        
           dpkg -x $src .

+2 -2

pkgs/applications/audio/jamin/default.nix

···

       11
       11
        
           sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkg-config ];

     

       15
       15
       -
         buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]

     

       14
       14
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       15
       15
       +
         buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ]

     

       16
       16
        
           ++ (with perlPackages; [ perl XMLParser ]);

     

       17
       17
        
       

     

       18
       18
        
         NIX_LDFLAGS = "-ldl";

+2 -2

pkgs/applications/audio/lash/default.nix

···

       15
       15
        
         # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346

     

       16
       16
        
         patches = [ ./socket.patch ./gcc-47.patch ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper

     

       19
       19
       -
           pkg-config readline ];

     

       18
       18
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       19
       19
       +
         buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ];

     

       20
       20
        
         propagatedBuildInputs = [ libuuid ];

     

       21
       21
        
         NIX_LDFLAGS = "-lm -lpthread -luuid";

     

       22
       22

+2 -2

pkgs/applications/audio/linuxband/default.nix

···

       11
       11
        
           sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkg-config ];

     

       15
       15
       -
         buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];

     

       14
       14
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       15
       15
       +
         buildInputs = [ MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];

     

       16
       16
        
       

     

       17
       17
        
         patchPhase = ''

     

       18
       18
        
           sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in

+1 -1

pkgs/applications/audio/puredata/wrapper.nix

···

       7
       7
        
       

     

       8
       8
        
         paths = [ puredata ] ++ plugins;

     

       9
       9
        
       

     

       10
       10
       -
         buildInputs = [ makeWrapper ];

     

       10
       10
       +
         nativeBuildInputs = [ makeWrapper ];

     

       11
       11
        
       

     

       12
       12
        
         postBuild = ''

     

       13
       13
        
           wrapProgram $out/bin/pd \

+2 -1

pkgs/applications/audio/real_time_config_quick_scan/default.nix

···

       11
       11
        
           sha256 = "16kanzp5i353x972zjkwgi3m8z90wc58613mlfzb0n01djdnm6k5";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ perlPackages.perl makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ perlPackages.perl ];

     

       15
       16
        
       

     

       16
       17
        
         dontBuild = true;

     

       17
       18

+2 -1

pkgs/applications/audio/rubyripper/default.nix

···

       10
       10
        
         preConfigure = "patchShebangs .";

     

       11
       11
        
       

     

       12
       12
        
         configureFlags = [ "--enable-cli" ];

     

       13
       13
       -
         buildInputs = [ ruby cdparanoia makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ ruby cdparanoia ];

     

       14
       15
        
         postInstall = ''

     

       15
       16
        
           wrapProgram "$out/bin/rrip_cli" \

     

       16
       17
        
             --prefix PATH : "${ruby}/bin" \

+2 -1

pkgs/applications/audio/spotify/default.nix

···

       81
       81
        
           sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";

     

       82
       82
        
         };

     

       83
       83
        
       

     

       84
       84
       -
         buildInputs = [ squashfsTools makeWrapper ];

     

       84
       84
       +
         nativeBuildInputs = [ makeWrapper ];

     

       85
       85
       +
         buildInputs = [ squashfsTools ];

     

       85
       86
        
       

     

       86
       87
        
         dontStrip = true;

     

       87
       88
        
         dontPatchELF = true;

+2 -1

pkgs/applications/audio/vkeybd/default.nix

···

       9
       9
        
           sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ alsaLib libX11 makeWrapper tcl tk ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ alsaLib libX11 tcl tk ];

     

       13
       14
        
       

     

       14
       15
        
         configurePhase = ''

     

       15
       16
        
           mkdir -p $out/bin

+1 -1

pkgs/applications/editors/eclipse/default.nix

···

       162
       162
        
             # Eclipse.

     

       163
       163
        
             name = (lib.meta.appendToName "with-plugins" eclipse).name;

     

       164
       164
        
           in

     

       165
       165
       -
             runCommand name { buildInputs = [ makeWrapper ]; } ''

     

       165
       165
       +
             runCommand name { nativeBuildInputs = [ makeWrapper ]; } ''

     

       166
       166
        
               mkdir -p $out/bin $out/etc

     

       167
       167
        
       

     

       168
       168
        
               # Prepare an eclipse.ini with the plugin directory.

+1 -1

pkgs/applications/editors/kakoune/wrapper.nix

···

       9
       9
        
         symlinkJoin {

     

       10
       10
        
           name = "kakoune-${kakoune.version}";

     

       11
       11
        
       

     

       12
       12
       -
           buildInputs = [ makeWrapper ];

     

       12
       12
       +
           nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
           paths = [ kakoune ] ++ requestedPlugins;

     

       15
       15

+2 -1

pkgs/applications/editors/kodestudio/default.nix

···

       29
       29
        
               inherit sha256;

     

       30
       30
        
           };

     

       31
       31
        
       

     

       32
       32
       -
           buildInputs = [ makeWrapper libXScrnSaver ];

     

       32
       32
       +
           nativeBuildInputs = [ makeWrapper ];

     

       33
       33
       +
           buildInputs = [ libXScrnSaver ];

     

       33
       34
        
       

     

       34
       35
        
           desktopItem = makeDesktopItem {

     

       35
       36
        
             name = "kodestudio";

+1 -1

pkgs/applications/editors/music/tuxguitar/default.nix

···

       14
       14
        
           sha256 = metadata.sha256;

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         installPhase = ''

     

       20
       20
        
           mkdir -p $out/bin

+1 -1

pkgs/applications/editors/neovim/wrapper.nix

···

       106
       106
        
       

     

       107
       107
        
           preferLocalBuild = true;

     

       108
       108
        
       

     

       109
       109
       -
           buildInputs = [makeWrapper];

     

       109
       109
       +
           nativeBuildInputs = [ makeWrapper ];

     

       110
       110
        
           passthru = { unwrapped = neovim; };

     

       111
       111
        
       

     

       112
       112
        
           meta = neovim.meta // {

+2 -1

pkgs/applications/editors/netbeans/default.nix

···

       56
       56
        
           ln -s ${desktopItem}/share/applications/* $out/share/applications

     

       57
       57
        
         '';

     

       58
       58
        
       

     

       59
       59
       -
         buildInputs = [ makeWrapper perl python unzip libicns imagemagick ];

     

       59
       59
       +
         nativeBuildInputs = [ makeWrapper ];

     

       60
       60
       +
         buildInputs = [ perl python unzip libicns imagemagick ];

     

       60
       61
        
       

     

       61
       62
        
         meta = {

     

       62
       63
        
           description = "An integrated development environment for Java, C, C++ and PHP";

+2 -2

pkgs/applications/editors/supertux-editor/default.nix

···

       10
       10
        
           sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ pkg-config ];

     

       14
       14
       -
         buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ];

     

       13
       13
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       14
       14
       +
         buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           mkdir -p $out/bin $out/lib/supertux-editor

+1 -1

pkgs/applications/editors/vim/macvim-configurable.nix

···

       29
       29
        
                 "/Applications/MacVim.app/Contents/MacOS"

     

       30
       30
        
                 "/Applications/MacVim.app/Contents/bin"

     

       31
       31
        
               ];

     

       32
       32
       -
               buildInputs = [ makeWrapper ];

     

       32
       32
       +
               nativeBuildInputs = [ makeWrapper ];

     

       33
       33
        
               # We need to do surgery on the resulting app. We can't just make a wrapper for vim because this

     

       34
       34
        
               # is a GUI app. We need to copy the actual GUI executable image as AppKit uses the loaded image's

     

       35
       35
        
               # path to locate the bundle. We can use symlinks for other executables and resources though.

+2 -1

pkgs/applications/editors/vscode/with-extensions.nix

···

       57
       57
        
       # When no extensions are requested, we simply redirect to the original

     

       58
       58
        
       # non-wrapped vscode executable.

     

       59
       59
        
       runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {

     

       60
       60
       -
         buildInputs = [ vscode makeWrapper ];

     

       60
       60
       +
         nativeBuildInputs = [ makeWrapper ];

     

       61
       61
       +
         buildInputs = [ vscode ];

     

       61
       62
        
         dontPatchELF = true;

     

       62
       63
        
         dontStrip = true;

     

       63
       64
        
         meta = vscode.meta;

+1 -1

pkgs/applications/graphics/gimp/wrapper.nix

···

       11
       11
        
       

     

       12
       12
        
         paths = [ gimp ] ++ selectedPlugins;

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         postBuild = ''

     

       17
       17
        
           for each in gimp-${versionBranch} gimp-console-${versionBranch}; do

+1 -1

pkgs/applications/graphics/glimpse/wrapper.nix

···

       12
       12
        
       

     

       13
       13
        
         paths = [ glimpse ] ++ selectedPlugins;

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         postBuild = ''

     

       18
       18
        
           for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do

+2 -1

pkgs/applications/graphics/imagej/default.nix

···

       15
       15
        
             url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";

     

       16
       16
        
             sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";

     

       17
       17
        
           };

     

       18
       18
       -
           buildInputs = [ unzip makeWrapper ];

     

       18
       18
       +
           nativeBuildInputs = [ makeWrapper ];

     

       19
       19
       +
           buildInputs = [ unzip ];

     

       19
       20
        
           inherit jre;

     

       20
       21
        
       

     

       21
       22
        
           # JAR files that are intended to be used by other packages

+1 -1

pkgs/applications/graphics/inkscape/with-extensions.nix

···

       10
       10
        
       

     

       11
       11
        
         paths = [ inkscape ] ++ inkscapeExtensions;

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
       

     

       15
       15
        
         postBuild = ''

     

       16
       16
        
           rm -f $out/bin/inkscape

+1 -1

pkgs/applications/graphics/tesseract/wrapper.nix

···

       17
       17
        
         tesseractWithData = tesseractBase.overrideAttrs (_: {

     

       18
       18
        
           inherit tesseractBase tessdata;

     

       19
       19
        
       

     

       20
       20
       -
           buildInputs = [ makeWrapper ];

     

       20
       20
       +
           nativeBuildInputs = [ makeWrapper ];

     

       21
       21
        
       

     

       22
       22
        
           buildCommand = ''

     

       23
       23
        
             makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata

+1 -1

pkgs/applications/graphics/unigine-valley/default.nix

···

       38
       38
        
           sourceRoot = "Unigine_Valley-${version}";

     

       39
       39
        
           instPath = "lib/unigine/valley";

     

       40
       40
        
       

     

       41
       41
       -
           buildInputs = [file makeWrapper];

     

       41
       41
       +
           nativeBuildInputs = [file makeWrapper];

     

       42
       42
        
       

     

       43
       43
        
           libPath = lib.makeLibraryPath [

     

       44
       44
        
             stdenv.cc.cc  # libstdc++.so.6

+2 -1

pkgs/applications/misc/ape/default.nix

···

       10
       10
        
         inherit pname;

     

       11
       11
        
         version = "2019-08-10";

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ swiProlog makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ swiProlog ];

     

       14
       15
        
       

     

       15
       16
        
         src = fetchFromGitHub {

     

       16
       17
        
            owner = "Attempto";

+2 -1

pkgs/applications/misc/audio/wavesurfer/default.nix

···

       8
       8
        
           sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ snack tcl tk makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ snack tcl tk ];

     

       12
       13
        
       

     

       13
       14
        
         installPhase = ''

     

       14
       15
        
           mkdir -p $out/{bin,nix-support,share/wavesurfer/}

+1 -1

pkgs/applications/misc/bashSnippets/default.nix

···

       22
       22
        
           sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         buildInputs = [ makeWrapper ];

     

       25
       25
       +
         nativeBuildInputs = [ makeWrapper ];

     

       26
       26
        
       

     

       27
       27
        
         patchPhase = ''

     

       28
       28
        
           patchShebangs install.sh

+2 -2

pkgs/applications/misc/cli-visualizer/default.nix

···

       15
       15
        
           sed '1i#include <cmath>' -i src/Transformer/SpectrumCircleTransformer.cpp

     

       16
       16
        
         '';

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ cmake ];

     

       18
       18
       +
         nativeBuildInputs = [ cmake makeWrapper ];

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ];

     

       20
       20
       +
         buildInputs = [ fftw ncurses5 libpulseaudio ];

     

       21
       21
        
       

     

       22
       22
        
         buildFlags = [ "ENABLE_PULSE=1" ];

     

       23
       23

+1 -2

pkgs/applications/misc/clipmenu/default.nix

···

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       30
       30
       -
         buildInputs = [ makeWrapper ];

     

       31
       31
       -
         nativeBuildInputs = [ xsel clipnotify ];

     

       30
       30
       +
         nativeBuildInputs = [ makeWrapper xsel clipnotify ];

     

       32
       31
        
       

     

       33
       32
        
         postFixup = ''

     

       34
       33
        
           sed -i "$out/bin/clipctl" -e 's,clipmenud\$,\.clipmenud-wrapped\$,'

+2 -1

pkgs/applications/misc/ding/default.nix

···

       17
       17
        
           sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         buildInputs = [ aspellEnv fortune gnugrep tk tre ];

     

       21
       22
        
       

     

       22
       23
        
         patches = [ ./dict.patch ];

     

       23
       24

+1 -1

pkgs/applications/misc/gremlin-console/default.nix

···

       8
       8
        
           sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
        
       

     

       13
       13
        
         installPhase = ''

     

       14
       14
        
           mkdir -p $out/opt

+1 -1

pkgs/applications/misc/icesl/default.nix

···

       14
       14
        
           sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr";

     

       15
       15
        
         } else throw "Unsupported architecture";

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
        
         installPhase = ''

     

       19
       19
        
           cp -r ./ $out

     

       20
       20
        
           mkdir $out/oldbin

+2 -1

pkgs/applications/misc/josm/default.nix

···

       23
       23
        
       

     

       24
       24
        
         dontUnpack = true;

     

       25
       25
        
       

     

       26
       26
       -
         buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ];

     

       26
       26
       +
         nativeBuildInputs = [ makeWrapper ];

     

       27
       27
       +
         buildInputs = lib.optionals (!stdenv.isDarwin) [ jre ];

     

       27
       28
        
       

     

       28
       29
        
         installPhase =

     

       29
       30
        
           if stdenv.isDarwin then ''

+2 -1

pkgs/applications/misc/keepass/default.nix

···

       12
       12
        
       

     

       13
       13
        
         sourceRoot = ".";

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ unzip makeWrapper icoutils ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = [ unzip icoutils ];

     

       16
       17
        
       

     

       17
       18
        
         patches = [

     

       18
       19
        
           (substituteAll {

+2 -1

pkgs/applications/misc/mpvc/default.nix

···

       17
       17
        
           wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/"

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ socat makeWrapper ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         buildInputs = [ socat ];

     

       21
       22
        
       

     

       22
       23
        
         meta = with lib; {

     

       23
       24
        
           description = "A mpc-like control interface for mpv";

+2 -1

pkgs/applications/misc/omegat.nix

···

       9
       9
        
           sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ unzip makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ unzip ];

     

       13
       14
        
       

     

       14
       15
        
         unpackCmd = "unzip -o $curSrc";  # tries to go interactive without -o

     

       15
       16

+2 -1

pkgs/applications/misc/openjump/default.nix

···

       18
       18
        
           cd $out; unzip $src

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [unzip makeWrapper];

     

       21
       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       +
         buildInputs = [ unzip ];

     

       22
       23
        
       

     

       23
       24
        
         installPhase = ''

     

       24
       25
        
           dir=$(echo $out/OpenJUMP-*)

+2 -1

pkgs/applications/misc/projectlibre/default.nix

···

       10
       10
        
           sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ ant jdk makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ ant jdk ];

     

       14
       15
        
         buildPhase = ''

     

       15
       16
        
           export ANT_OPTS=-Dbuild.sysclasspath=ignore

     

       16
       17
        
           ${ant}/bin/ant -f openproj_build/build.xml

+1 -1

pkgs/applications/misc/sidequest/default.nix

···

       19
       19
        
               sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";

     

       20
       20
        
             };

     

       21
       21
        
       

     

       22
       22
       -
             buildInputs = [ makeWrapper ];

     

       22
       22
       +
             nativeBuildInputs = [ makeWrapper ];

     

       23
       23
        
       

     

       24
       24
        
             buildCommand = ''

     

       25
       25
        
               mkdir -p "$out/lib/SideQuest" "$out/bin"

+2 -1

pkgs/applications/misc/sweethome3d/default.nix

···

       34
       34
        
             patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so

     

       35
       35
        
           '';

     

       36
       36
        
       

     

       37
       37
       -
           buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ];

     

       37
       37
       +
           nativeBuildInputs = [ makeWrapper ];

     

       38
       38
       +
           buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas ];

     

       38
       39
        
       

     

       39
       40
        
           buildPhase = ''

     

       40
       41
        
             ant furniture textures help

+2 -1

pkgs/applications/misc/sweethome3d/editors.nix

···

       23
       23
        
             categories = "Graphics;2DGraphics;3DGraphics;";

     

       24
       24
        
           };

     

       25
       25
        
       

     

       26
       26
       -
           buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ];

     

       26
       26
       +
           nativeBuildInputs = [ makeWrapper ];

     

       27
       27
       +
           buildInputs = [ ant jre jdk gtk3 gsettings-desktop-schemas ];

     

       27
       28
        
       

     

       28
       29
        
           patchPhase = ''

     

       29
       30
        
             sed -i -e 's,../SweetHome3D,${application.src},g' build.xml

+1 -1

pkgs/applications/misc/tabula/default.nix

···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
       

     

       18
       18
        
         installPhase = ''

+1 -1

pkgs/applications/misc/translate-shell/default.nix

···

       11
       11
        
           sha256 = "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installFlags = [ "PREFIX=$(out)" ];

     

       17
       17

+2 -2

pkgs/applications/misc/viking/default.nix

···

       25
       25
        
           })

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       -
         nativeBuildInputs = [ pkg-config ];

     

       29
       29
       -
         buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils

     

       28
       28
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       29
       29
       +
         buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils

     

       30
       30
        
           libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2

     

       31
       31
        
         ] ++ lib.optional withMapnik mapnik

     

       32
       32
        
           ++ lib.optional withGeoClue geoclue2

+2 -1

pkgs/applications/misc/wordnet/default.nix

···

       8
       8
        
           sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ tcl tk xlibsWrapper makeWrapper ]

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ tcl tk xlibsWrapper ]

     

       12
       13
        
           ++ lib.optionals stdenv.isDarwin [ Cocoa ];

     

       13
       14
        
       

     

       14
       15
        
         hardeningDisable = [ "format" ];

+2 -2

pkgs/applications/misc/xfontsel/default.nix

···

       11
       11
        
           sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkg-config ];

     

       15
       15
       -
         buildInputs = [libX11 makeWrapper libXaw];

     

       14
       14
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       15
       15
       +
         buildInputs = [libX11 libXaw];

     

       16
       16
        
       

     

       17
       17
        
         # Without this, it gets Xmu as a dependency, but without rpath entry

     

       18
       18
        
         NIX_LDFLAGS = "-lXmu";

+1 -2

pkgs/applications/misc/zathura/wrapper.nix

···

       4
       4
        
       

     

       5
       5
        
         paths = with zathura_core; [ man dev out ] ++ plugins;

     

       6
       6
        
       

     

       7
       7
       -
       

     

       8
       8
       -
         buildInputs = [ makeWrapper ];

     

       7
       7
       +
         nativeBuildInputs = [ makeWrapper ];

     

       9
       8
        
       

     

       10
       9
        
         postBuild = let

     

       11
       10
        
           fishCompletion = "share/fish/vendor_completions.d/zathura.fish";

+1 -1

pkgs/applications/networking/charles/default.nix

···

       28
       28
        
               url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";

     

       29
       29
        
               inherit sha256;

     

       30
       30
        
             };

     

       31
       31
       -
             buildInputs = [ makeWrapper ];

     

       31
       31
       +
             nativeBuildInputs = [ makeWrapper ];

     

       32
       32
        
       

     

       33
       33
        
             installPhase = ''

     

       34
       34
        
               makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \

+2 -1

pkgs/applications/networking/cluster/spark/default.nix

···

       14
       14
        
           sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
       +
         buildInputs = [ jre pythonPackages.python pythonPackages.numpy ]

     

       18
       19
        
           ++ optional RSupport R;

     

       19
       20
        
       

     

       20
       21
        
         untarDir = "${pname}-${version}-bin-without-hadoop";

+1 -1

pkgs/applications/networking/cluster/ssm-agent/default.nix

···

       14
       14
        
           "agent/cli-main"

     

       15
       15
        
         ];

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           rev    = version;

+1 -1

pkgs/applications/networking/cluster/terraform/default.nix

···

       117
       117
        
               else

     

       118
       118
        
                 lib.appendToName "with-plugins" (stdenv.mkDerivation {

     

       119
       119
        
                   inherit (terraform) name meta;

     

       120
       120
       -
                   buildInputs = [ makeWrapper ];

     

       120
       120
       +
                   nativeBuildInputs = [ makeWrapper ];

     

       121
       121
        
       

     

       122
       122
        
                   buildCommand = pluginDir + ''

     

       123
       123
        
                     mkdir -p $out/bin/

+2 -1

pkgs/applications/networking/ids/snort/default.nix

···

       12
       12
        
           sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];

     

       16
       17
        
       

     

       17
       18
        
         NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];

     

       18
       19

+2 -1

pkgs/applications/networking/instant-messengers/gomuks/default.nix

···

       26
       26
        
       

     

       27
       27
        
         doCheck = false;

     

       28
       28
        
       

     

       29
       29
       -
         buildInputs = [ makeWrapper olm ];

     

       29
       29
       +
         nativeBuildInputs = [ makeWrapper ];

     

       30
       30
       +
         buildInputs = [ olm ];

     

       30
       31
        
       

     

       31
       32
        
         # Upstream issue: https://github.com/tulir/gomuks/issues/260

     

       32
       33
        
         patches = lib.optional stdenv.isLinux (substituteAll {

+1 -1

pkgs/applications/networking/instant-messengers/hipchat/default.nix

···

       47
       47
        
           sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96";

     

       48
       48
        
         };

     

       49
       49
        
       

     

       50
       50
       -
         buildInputs = [ makeWrapper ];

     

       50
       50
       +
         nativeBuildInputs = [ makeWrapper ];

     

       51
       51
        
       

     

       52
       52
        
         buildCommand = ''

     

       53
       53
        
           ar x $src

+2 -2

pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix

···

       9
       9
        
           sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = [ pkg-config ];

     

       13
       13
       -
         buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       13
       13
       +
         buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ];

     

       14
       14
        
       

     

       15
       15
        
         preFixup = ''

     

       16
       16
        
           wrapProgram "$out/libexec/telepathy-idle" \

+2 -1

pkgs/applications/networking/instant-messengers/viber/default.nix

···

       13
       13
        
           sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ dpkg makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
         buildInputs = [ dpkg ];

     

       17
       18
        
       

     

       18
       19
        
         dontUnpack = true;

     

       19
       20

+1 -3

pkgs/applications/networking/insync/default.nix

···

       12
       12
        
           else

     

       13
       13
        
             throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       16
       16
       -
       

     

       17
       17
       -
         nativeBuildInputs = [ autoPatchelfHook ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper autoPatchelfHook ];

     

       18
       16
        
       

     

       19
       17
        
         postPatch = ''

     

       20
       18
        
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable

+2 -1

pkgs/applications/networking/jnetmap/default.nix

···

       9
       9
        
           sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ jre makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ jre ];

     

       13
       14
        
       

     

       14
       15
        
         dontUnpack = true;

     

       15
       16

+1 -1

pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix

···

       4
       4
        
         name = "evolution-with-plugins";

     

       5
       5
        
         paths = [ gnome3.evolution-data-server ] ++ plugins;

     

       6
       6
        
       

     

       7
       7
       -
         buildInputs = [ makeWrapper ];

     

       7
       7
       +
         nativeBuildInputs = [ makeWrapper ];

     

       8
       8
        
       

     

       9
       9
        
         postBuild = ''

     

       10
       10
        
           for i in $out/bin/* $out/libexec/**; do

+2 -1

pkgs/applications/networking/p2p/vuze/default.nix

···

       9
       9
        
           sha256 = "07w6ipyiy8hi88d6yxbbf3vkv26mj7dcz9yr8141hb2ig03v0h0p";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper jdk ant ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ jdk ant ];

     

       13
       14
        
       

     

       14
       15
        
         buildPhase = "ant";

     

       15
       16

+1 -1

pkgs/applications/networking/remote/vmware-horizon-client/default.nix

···

       52
       52
        
             url = "https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-Linux-2012-8.1.0-17349998.tar.gz";

     

       53
       53
        
             sha256 = "0afda1f3116e75a4e7f89990d8ee60ccea5f3bb8a2360652162fa11c795724ce";

     

       54
       54
        
           };

     

       55
       55
       -
           buildInputs = [ makeWrapper ];

     

       55
       55
       +
           nativeBuildInputs = [ makeWrapper ];

     

       56
       56
        
           installPhase = ''

     

       57
       57
        
             mkdir ext $out

     

       58
       58
        
             find ${sysArch} -type f -print0 | xargs -0n1 tar -Cext --strip-components=1 -xf

+2 -1

pkgs/applications/networking/sync/unison/default.nix

···

       14
       14
        
           sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ ocaml makeWrapper ncurses ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
       +
         buildInputs = [ ocaml ncurses ];

     

       18
       19
        
       

     

       19
       20
        
         preBuild = (if enableX11 then ''

     

       20
       21
        
           sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml

+1 -1

pkgs/applications/networking/tsung/default.nix

···

       12
       12
        
           sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
         propagatedBuildInputs = [

     

       17
       17
        
           erlang

     

       18
       18
        
           gnuplot

+1 -1

pkgs/applications/networking/wg-bond/default.nix

···

       12
       12
        
       

     

       13
       13
        
         cargoSha256 = "1v2az0v6l8mqryvq3898hm7bpvqdd2c4kpv6ck7932jfjyna512k";

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
         postInstall = ''

     

       17
       17
        
           wrapProgram $out/bin/wg-bond --set PATH ${

     

       18
       18
        
             lib.makeBinPath [ wireguard-tools ]

+2 -1

pkgs/applications/office/docear/default.nix

···

       12
       12
        
           sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ oraclejre makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = [ oraclejre ];

     

       16
       17
        
       

     

       17
       18
        
         buildPhase = "";

     

       18
       19
        
         installPhase = ''

+2 -1

pkgs/applications/office/impressive/default.nix

···

       16
       16
        
             sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl";

     

       17
       17
        
           };

     

       18
       18
        
       

     

       19
       19
       -
           buildInputs = [ makeWrapper pythonEnv ];

     

       19
       19
       +
           nativeBuildInputs = [ makeWrapper ];

     

       20
       20
       +
           buildInputs = [ pythonEnv ];

     

       20
       21
        
       

     

       21
       22
        
           configurePhase = ''

     

       22
       23
        
             # Let's fail at build time if the library we're substituting in doesn't

+2 -1

pkgs/applications/office/treesheets/default.nix

···

       11
       11
        
           sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ wxGTK makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ wxGTK ];

     

       15
       16
        
       

     

       16
       17
        
         preConfigure = "cd src";

     

       17
       18

+1 -1

pkgs/applications/science/biology/eggnog-mapper/default.nix

···

       16
       16
        
           sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf";

     

       17
       17
        
         });

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ makeWrapper ];

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
        
         propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ];

     

       21
       21
        
       

     

       22
       22
        
         # make emapper find diamond & hmmer

+2 -1

pkgs/applications/science/biology/platypus/default.nix

···

       13
       13
        
           sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ htslib python zlib makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
         buildInputs = [ htslib python zlib ];

     

       17
       18
        
       

     

       18
       19
        
         buildPhase = ''

     

       19
       20
        
           patchShebangs .

+2 -1

pkgs/applications/science/biology/snpeff/default.nix

···

       9
       9
        
           sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ unzip jre makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ unzip jre ];

     

       13
       14
        
       

     

       14
       15
        
         sourceRoot = "snpEff";

     

       15
       16

+2 -1

pkgs/applications/science/biology/varscan/default.nix

···

       9
       9
        
           sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ jre makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ jre ];

     

       13
       14
        
       

     

       14
       15
        
         phases = [ "installPhase" ];

     

       15
       16

+2 -1

pkgs/applications/science/logic/isabelle/default.nix

···

       17
       17
        
             sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3";

     

       18
       18
        
           };

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ perl polyml z3 makeWrapper ]

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         buildInputs = [ perl polyml z3 ]

     

       21
       22
        
                    ++ lib.optionals (!stdenv.isDarwin) [ nettools java ];

     

       22
       23
        
       

     

       23
       24
        
         sourceRoot = dirname;

+2 -1

pkgs/applications/science/logic/leo2/default.nix

···

       9
       9
        
           sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper eprover ocaml perl zlib ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ eprover ocaml perl zlib ];

     

       13
       14
        
       

     

       14
       15
        
         sourceRoot = "leo2/src";

     

       15
       16

+2 -1

pkgs/applications/science/logic/satallax/default.nix

···

       3
       3
        
         pname = "satallax";

     

       4
       4
        
         version = "2.7";

     

       5
       5
        
       

     

       6
       6
       -
         buildInputs = [ocaml zlib which eprover makeWrapper coq];

     

       6
       6
       +
         nativeBuildInputs = [ makeWrapper ];

     

       7
       7
       +
         buildInputs = [ocaml zlib which eprover coq];

     

       7
       8
        
         src = fetchurl {

     

       8
       9
        
           url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";

     

       9
       10
        
           sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";

+2 -1

pkgs/applications/science/logic/tlaplus/default.nix

···

       13
       13
        
           sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ makeWrapper adoptopenjdk-bin ant ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
         buildInputs = [ adoptopenjdk-bin ant ];

     

       17
       18
        
       

     

       18
       19
        
         buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist";

     

       19
       20
        
         installPhase = ''

+1 -1

pkgs/applications/science/logic/tlaplus/toolbox.nix

···

       28
       28
        
           sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
       -
         buildInputs = [ makeWrapper  ];

     

       31
       31
       +
         nativeBuildInputs = [ makeWrapper ];

     

       32
       32
        
       

     

       33
       33
        
         phases = [ "installPhase" ];

     

       34
       34

+2 -1

pkgs/applications/science/logic/why3/with-provers.nix

···

       15
       15
        
       

     

       16
       16
        
         phases = [ "buildPhase" "installPhase" ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ why3 makeWrapper ] ++ provers;

     

       18
       18
       +
         nativeBuildInputs = [ makeWrapper ];

     

       19
       19
       +
         buildInputs = [ why3 ] ++ provers;

     

       19
       20
        
       

     

       20
       21
        
         buildPhase = ''

     

       21
       22
        
             mkdir -p $out/share/why3/

+1 -1

pkgs/applications/science/logic/workcraft/default.nix

···

       9
       9
        
           sha256 = "0v71x3fph2j3xrnysvkm7zsgnbxisfbdfgxzvzxxfdg59a6l3xid";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
         phases = [ "unpackPhase" "installPhase" "fixupPhase" ];

     

       15
       15

+2 -1

pkgs/applications/science/math/calc/default.nix

···

       19
       19
        
             --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ util-linux makeWrapper ]

     

       22
       22
       +
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       +
         buildInputs = [ util-linux ]

     

       23
       24
        
                    ++ lib.optionals enableReadline [ readline ncurses ];

     

       24
       25
        
       

     

       25
       26
        
         makeFlags = [

+2 -1

pkgs/applications/science/math/weka/default.nix

···

       9
       9
        
           sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ unzip makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ unzip ];

     

       13
       14
        
       

     

       14
       15
        
         # The -Xmx1000M comes suggested from their download page:

     

       15
       16
        
         # http://www.cs.waikato.ac.nz/ml/weka/downloading.html

+2 -1

pkgs/applications/science/medicine/aliza/default.nix

···

       11
       11
        
           name = "aliza.rpm";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ rpmextract makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ rpmextract ];

     

       15
       16
        
       

     

       16
       17
        
         unpackCmd = "rpmextract $curSrc";

     

       17
       18

+2 -1

pkgs/applications/science/misc/cytoscape/default.nix

···

       18
       18
        
           })

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [jre makeWrapper];

     

       21
       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       +
         buildInputs = [ jre ];

     

       22
       23
        
       

     

       23
       24
        
         installPhase = ''

     

       24
       25
        
           mkdir -pv $out/{share,bin}

+2 -1

pkgs/applications/science/programming/plm/default.nix

···

       14
       14
        
           name = "${pname}-${version}.jar";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper jre gcc valgrind ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
       +
         buildInputs = [ jre gcc valgrind ];

     

       18
       19
        
       

     

       19
       20
        
         phases = [ "installPhase" ];

     

       20
       21

+1 -1

pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix

···

       40
       40
        
       

     

       41
       41
        
               paths = [ rxvt-unicode-unwrapped ] ++ plugins ++ extraDeps;

     

       42
       42
        
       

     

       43
       43
       -
               buildInputs = [ makeWrapper ];

     

       43
       43
       +
               nativeBuildInputs = [ makeWrapper ];

     

       44
       44
        
       

     

       45
       45
        
               postBuild = ''

     

       46
       46
        
                 wrapProgram $out/bin/urxvt \

+2 -1

pkgs/applications/terminal-emulators/terminus/default.nix

···

       18
       18
        
           url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb";

     

       19
       19
        
           sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb";

     

       20
       20
        
         };

     

       21
       21
       -
         buildInputs = [ dpkg makeWrapper ];

     

       21
       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       +
         buildInputs = [ dpkg ];

     

       22
       23
        
         unpackPhase = ''

     

       23
       24
        
           mkdir pkg

     

       24
       25
        
           dpkg-deb -x $src pkg

+1 -1

pkgs/applications/version-management/cvs2svn/default.nix

···

       12
       12
        
           sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         checkInputs = [ subversion git breezy ];

     

       18
       18

+2 -1

pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix

···

       15
       15
        
             sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";

     

       16
       16
        
           };

     

       17
       17
        
       

     

       18
       18
       -
           buildInputs = [ jre makeWrapper ];

     

       18
       18
       +
           nativeBuildInputs = [ makeWrapper ];

     

       19
       19
       +
           buildInputs = [ jre ];

     

       19
       20
        
       

     

       20
       21
        
           phases = "installPhase";

     

       21
       22

+2 -1

pkgs/applications/version-management/git-and-tools/fast-export/default.nix

···

       11
       11
        
           sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [mercurial.python mercurial makeWrapper];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [mercurial.python mercurial];

     

       15
       16
        
       

     

       16
       17
        
         installPhase = ''

     

       17
       18
        
           binPath=$out/bin

+2 -2

pkgs/applications/version-management/git-and-tools/git-crypt/default.nix

···

       13
       13
        
           sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ libxslt ];

     

       16
       16
       +
         nativeBuildInputs = [ libxslt makeWrapper ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ openssl makeWrapper ];

     

       18
       18
       +
         buildInputs = [ openssl ];

     

       19
       19
        
       

     

       20
       20
        
         patchPhase = ''

     

       21
       21
        
           substituteInPlace commands.cpp \

+1 -1

pkgs/applications/version-management/git-and-tools/git-octopus/default.nix

···

       8
       8
        
       

     

       9
       9
        
         installFlags = [ "prefix=$(out)" ];

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
        
       

     

       13
       13
        
         # perl provides shasum

     

       14
       14
        
         postInstall = ''

+1 -1

pkgs/applications/version-management/git-and-tools/git-open/default.nix

···

       11
       11
        
           sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         buildPhase = null;

     

       17
       17

+1 -1

pkgs/applications/version-management/git-and-tools/git-recent/default.nix

···

       14
       14
        
           sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         buildPhase = null;

     

       20
       20

+1 -1

pkgs/applications/version-management/git-and-tools/git-reparent/default.nix

···

       11
       11
        
           sha256 = "0v0yxydpw6r4awy0hb7sbnh520zsk86ibzh1xjf3983yhsvkfk5v";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         dontBuild = true;

     

       17
       17

+1 -1

pkgs/applications/version-management/git-and-tools/git-secret/default.nix

···

       14
       14
        
           sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         installPhase = ''

     

       20
       20
        
           install -D git-secret $out/bin/git-secret

+1 -1

pkgs/applications/version-management/git-and-tools/git-sync/default.nix

···

       12
       12
        
           sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         dontBuild = true;

     

       18
       18

+2 -2

pkgs/applications/version-management/git-and-tools/git/default.nix

···

       67
       67
        
               --subst-var-by gettext ${gettext}

     

       68
       68
        
         '';

     

       69
       69
        
       

     

       70
       70
       -
         nativeBuildInputs = [ gettext perlPackages.perl ]

     

       70
       70
       +
         nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]

     

       71
       71
        
           ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x

     

       72
       72
        
                docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ];

     

       73
       73
       -
         buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv]

     

       73
       73
       +
         buildInputs = [curl openssl zlib expat cpio libiconv]

     

       74
       74
        
           ++ lib.optionals perlSupport [ perlPackages.perl ]

     

       75
       75
        
           ++ lib.optionals guiSupport [tcl tk]

     

       76
       76
        
           ++ lib.optionals withpcre2 [ pcre2 ]

+1 -1

pkgs/applications/version-management/git-and-tools/gitflow/default.nix

···

       13
       13
        
           sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ pkgs.makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ pkgs.makeWrapper ];

     

       17
       17
        
       

     

       18
       18
        
         preBuild = ''

     

       19
       19
        
           makeFlagsArray+=(prefix="$out")

+1 -1

pkgs/applications/version-management/git-and-tools/svn2git/default.nix

···

       12
       12
        
           sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ ruby makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ ruby makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         dontBuild = true;

     

       18
       18

+2 -1

pkgs/applications/version-management/git-and-tools/transcrypt/default.nix

···

       11
       11
        
           sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper git openssl coreutils util-linux gnugrep gnused gawk ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ];

     

       15
       16
        
       

     

       16
       17
        
         patches = [ ./helper-scripts_depspathprefix.patch ];

     

       17
       18

+2 -1

pkgs/applications/version-management/mercurial/4.9.nix

···

       21
       21
        
       

     

       22
       22
        
         inherit python; # pass it so that the same version can be used in hg2git

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ makeWrapper docutils unzip ]

     

       24
       24
       +
         nativeBuildInputs = [ makeWrapper ];

     

       25
       25
       +
         buildInputs = [ docutils unzip ]

     

       25
       26
        
           ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];

     

       26
       27
        
       

     

       27
       28
        
         propagatedBuildInputs = [ hg-git dulwich ];

+2 -1

pkgs/applications/version-management/mercurial/default.nix

···

       19
       19
        
       

     

       20
       20
        
         passthru = { inherit python; }; # pass it so that the same version can be used in hg2git

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ makeWrapper docutils unzip ]

     

       22
       22
       +
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       +
         buildInputs = [ docutils unzip ]

     

       23
       24
        
           ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];

     

       24
       25
        
       

     

       25
       26
        
         makeFlags = [ "PREFIX=$(out)" ];

+2 -2

pkgs/applications/version-management/monotone-viz/default.nix

···

       13
       13
        
         version = "1.0.2";

     

       14
       14
        
         pname = "monotone-viz";

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ pkg-config ];

     

       17
       17
       -
         buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];

     

       16
       16
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       17
       17
       +
         buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4];

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";

     

       20
       20
        
           sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";

+2 -1

pkgs/applications/video/lightworks/default.nix

···

       30
       30
        
               }

     

       31
       31
        
             else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";

     

       32
       32
        
       

     

       33
       33
       -
           buildInputs = [ dpkg makeWrapper ];

     

       33
       33
       +
           nativeBuildInputs = [ makeWrapper ];

     

       34
       34
       +
           buildInputs = [ dpkg ];

     

       34
       35
        
       

     

       35
       36
        
           phases = [ "unpackPhase" "installPhase" ];

     

       36
       37
        
           unpackPhase = "dpkg-deb -x ${src} ./";

+2 -2

pkgs/applications/video/quvi/tool.nix

···

       9
       9
        
           sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = [ pkg-config ];

     

       13
       13
       -
         buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       13
       13
       +
         buildInputs = [ lua5 curl quvi_scripts libquvi glib ];

     

       14
       14
        
         postInstall = ''

     

       15
       15
        
             wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua"

     

       16
       16
        
         '';

+1 -1

pkgs/applications/video/xscast/default.nix

···

       11
       11
        
           sha256 = "0br27bq9bpglfdpv63h827bipgvhlh10liyhmhcxls4227kagz72";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           runHook preInstall

+1 -1

pkgs/applications/virtualization/docker/gc.nix

···

       13
       13
        
           sha256 = "07wf9yn0f771xkm3x12946x5rp83hxjkd70xgfgy35zvj27wskzm";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
        
       

     

       18
       18
        
         installPhase = ''

     

       19
       19
        
           mkdir -p $out/bin

+2 -1

pkgs/applications/window-managers/leftwm/default.nix

···

       17
       17
        
       

     

       18
       18
        
         cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM=";

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ makeWrapper libX11 libXinerama ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         buildInputs = [ libX11 libXinerama ];

     

       21
       22
        
       

     

       22
       23
        
         postInstall = ''

     

       23
       24
        
           wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"

+2 -1

pkgs/build-support/templaterpm/default.nix

···

       4
       4
        
         pname = "nix-template-rpm";

     

       5
       5
        
         version = "0.1";

     

       6
       6
        
       

     

       7
       7
       -
         buildInputs = [ makeWrapper python toposort rpm ];

     

       7
       7
       +
         nativeBuildInputs = [ makeWrapper ];

     

       8
       8
       +
         buildInputs = [ python toposort rpm ];

     

       8
       9
        
       

     

       9
       10
        
         phases = [ "installPhase" "fixupPhase" ];

     

       10
       11

+1 -1

pkgs/common-updater/scripts.nix

···

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "common-updater-scripts";

     

       5
       5
        
       

     

       6
       6
       -
         buildInputs = [ makeWrapper ];

     

       6
       6
       +
         nativeBuildInputs = [ makeWrapper ];

     

       7
       7
        
       

     

       8
       8
        
         dontUnpack = true;

     

       9
       9

+1 -1

pkgs/desktops/xfce/core/thunar/wrapper.nix

···

       5
       5
        
       

     

       6
       6
        
         paths = [ thunar ] ++ thunarPlugins;

     

       7
       7
        
       

     

       8
       8
       -
         buildInputs = [ makeWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ makeWrapper ];

     

       9
       9
        
       

     

       10
       10
        
         postBuild = ''

     

       11
       11
        
           wrapProgram "$out/bin/thunar" \

+2 -2

pkgs/development/compilers/aldor/default.nix

···

       10
       10
        
           rev = "15471e75f3d65b93150f414ebcaf59a03054b68d";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool

     

       14
       14
       -
                         jdk perl ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ gmp which flex bison autoconf automake libtool jdk perl ];

     

       15
       15
        
       

     

       16
       16
        
         preConfigure = ''

     

       17
       17
        
           cd aldor ;

+2 -1

pkgs/development/compilers/chicken/4/eggDerivation.nix

···

       18
       18
        
       stdenv.mkDerivation ({

     

       19
       19
        
         name = "chicken-${name}";

     

       20
       20
        
         propagatedBuildInputs = buildInputs;

     

       21
       21
       -
         buildInputs = [ makeWrapper chicken ];

     

       21
       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       +
         buildInputs = [ chicken ];

     

       22
       23
        
       

     

       23
       24
        
         CSC_OPTIONS = lib.concatStringsSep " " cscOptions;

     

       24
       25

+2 -1

pkgs/development/compilers/chicken/5/eggDerivation.nix

···

       17
       17
        
       stdenv.mkDerivation ({

     

       18
       18
        
         name = "chicken-${name}";

     

       19
       19
        
         propagatedBuildInputs = buildInputs;

     

       20
       20
       -
         buildInputs = [ makeWrapper chicken ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         buildInputs = [ chicken ];

     

       21
       22
        
       

     

       22
       23
        
         CSC_OPTIONS = lib.concatStringsSep " " cscOptions;

     

       23
       24

+2 -1

pkgs/development/compilers/factor-lang/default.nix

···

       19
       19
        
           ./fuel-dir.patch

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper

     

       22
       22
       +
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       +
         buildInputs = with xorg; [ git rlwrap curl pkg-config perl

     

       23
       24
        
           libX11 pango cairo gtk2 gdk-pixbuf gtkglext

     

       24
       25
        
           mesa libXmu libXt libICE libSM openssl unzip ];

     

       25
       26

+2 -1

pkgs/development/compilers/kotlin/default.nix

···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ jre ] ;

     

       15
       15
       -
         buildInputs = [ makeWrapper unzip ] ;

     

       15
       15
       +
         buildInputs = [ unzip ] ;

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       17
        
       

     

       17
       18
        
         installPhase = ''

     

       18
       19
        
           mkdir -p $out

+2 -2

pkgs/development/compilers/mercury/default.nix

···

       10
       10
        
           sha256 = "ef093ae81424c4f3fe696eff9aefb5fb66899e11bb17ae0326adfb70d09c1c1f";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper

     

       14
       14
       -
                         readline ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ gcc flex bison texinfo jdk erlang readline ];

     

       15
       15
        
       

     

       16
       16
        
         patchPhase = ''

     

       17
       17
        
           # Fix calls to programs in /bin

+1 -1

pkgs/development/compilers/mozart/binary.nix

···

       33
       33
        
       

     

       34
       34
        
         TK_LIBRARY = "${tk-8_5}/lib/tk8.5";

     

       35
       35
        
       

     

       36
       36
       -
         buildInputs = [ makeWrapper ];

     

       36
       36
       +
         nativeBuildInputs = [ makeWrapper ];

     

       37
       37
        
       

     

       38
       38
        
         buildCommand = ''

     

       39
       39
        
           mkdir $out

+1 -3

pkgs/development/compilers/oraclejdk/jdk-linux-base.nix

···

       83
       83
        
             sha256 = sha256.${stdenv.hostPlatform.system};

     

       84
       84
        
           };

     

       85
       85
        
       

     

       86
       86
       -
         nativeBuildInputs = [ file ]

     

       86
       86
       +
         nativeBuildInputs = [ file makeWrapper ]

     

       87
       87
        
           ++ lib.optional installjce unzip;

     

       88
       88
       -
       

     

       89
       89
       -
         buildInputs = [ makeWrapper ];

     

       90
       88
        
       

     

       91
       89
        
         # See: https://github.com/NixOS/patchelf/issues/10

     

       92
       90
        
         dontStrip = 1;

+2 -2

pkgs/development/compilers/rust/binary.nix

···

       83
       83
        
             license = [ licenses.mit licenses.asl20 ];

     

       84
       84
        
           };

     

       85
       85
        
       

     

       86
       86
       -
           buildInputs = [ makeWrapper bash ]

     

       87
       87
       -
             ++ lib.optional stdenv.isDarwin Security;

     

       86
       86
       +
           nativeBuildInputs = [ makeWrapper ];

     

       87
       87
       +
           buildInputs = [ bash ] ++ lib.optional stdenv.isDarwin Security;

     

       88
       88
        
       

     

       89
       89
        
           postPatch = ''

     

       90
       90
        
             patchShebangs .

+2 -2

pkgs/development/compilers/rust/rls/default.nix

···

       28
       28
        
         # rls-rustc links to rustc_private crates

     

       29
       29
        
         CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;

     

       30
       30
        
       

     

       31
       31
       -
         nativeBuildInputs = [ pkg-config cmake ];

     

       32
       32
       -
         buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ]

     

       31
       31
       +
         nativeBuildInputs = [ pkg-config cmake makeWrapper ];

     

       32
       32
       +
         buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ]

     

       33
       33
        
           ++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);

     

       34
       34
        
       

     

       35
       35
        
         doCheck = true;

+1 -1

pkgs/development/compilers/sbcl/bootstrap.nix

···

       51
       51
        
           sha256 = cfg.sha256;

     

       52
       52
        
         };

     

       53
       53
        
       

     

       54
       54
       -
         buildInputs = [ makeWrapper ];

     

       54
       54
       +
         nativeBuildInputs = [ makeWrapper ];

     

       55
       55
        
       

     

       56
       56
        
         installPhase = ''

     

       57
       57
        
           mkdir -p $out/bin

+1 -1

pkgs/development/compilers/scala/2.x.nix

···

       46
       46
        
       

     

       47
       47
        
         propagatedBuildInputs = [ jre ];

     

       48
       48
        
       

     

       49
       49
       -
         buildInputs = [ makeWrapper ];

     

       49
       49
       +
         nativeBuildInputs = [ makeWrapper ];

     

       50
       50
        
       

     

       51
       51
        
         installPhase = ''

     

       52
       52
        
             mkdir -p $out

+1 -1

pkgs/development/compilers/scala/dotty-bare.nix

···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ jre ncurses.dev ] ;

     

       13
       13
       -
         buildInputs = [ makeWrapper ] ;

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
       

     

       15
       15
        
         installPhase = ''

     

       16
       16
        
           mkdir -p $out

+2 -1

pkgs/development/compilers/smlnj/bootstrap.nix

···

       10
       10
        
           sha256 = "12jn50h5jz0ac1vzld2mb94p1dyc8h0mk0hip2wj5xqk1dbzwxl4";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ cpio rsync makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ cpio rsync ];

     

       14
       15
        
       

     

       15
       16
        
         unpackPhase = ''

     

       16
       17
        
           ${xar}/bin/xar -xf $src

+2 -1

pkgs/development/compilers/tinygo/default.nix

···

       40
       40
        
         '';

     

       41
       41
        
       

     

       42
       42
        
         subPackages = [ "." ];

     

       43
       43
       -
         buildInputs = [ llvm clang-unwrapped makeWrapper ];

     

       43
       43
       +
         nativeBuildInputs = [ makeWrapper ];

     

       44
       44
       +
         buildInputs = [ llvm clang-unwrapped ];

     

       44
       45
        
         propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ];

     

       45
       46
        
       

     

       46
       47
        
         postInstall = ''

+1 -1

pkgs/development/compilers/urn/default.nix

···

       30
       30
        
           sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
       -
         buildInputs = [ makeWrapper ];

     

       33
       33
       +
         nativeBuildInputs = [ makeWrapper ];

     

       34
       34
        
         # Any packages that depend on the compiler have a transitive

     

       35
       35
        
         # dependency on the Urn runtime support.

     

       36
       36
        
         propagatedBuildInputs = [ urn-rt ];

+1 -1

pkgs/development/interpreters/chibi/default.nix

···

       21
       21
        
           sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ makeWrapper ];

     

       24
       24
       +
         nativeBuildInputs = [ makeWrapper ];

     

       25
       25
        
       

     

       26
       26
        
         installPhase = ''

     

       27
       27
        
           make install PREFIX="$out"

+1 -1

pkgs/development/interpreters/clojure/clooj.nix

···

       12
       12
        
           sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         phases = "installPhase";

     

       18
       18

+2 -1

pkgs/development/interpreters/elixir/generic-builder.nix

···

       20
       20
        
       

     

       21
       21
        
           inherit src version;

     

       22
       22
        
       

     

       23
       23
       -
           buildInputs = [ erlang makeWrapper ];

     

       23
       23
       +
           nativeBuildInputs = [ makeWrapper ];

     

       24
       24
       +
           buildInputs = [ erlang ];

     

       24
       25
        
       

     

       25
       26
        
           LANG = "C.UTF-8";

     

       26
       27
        
           LC_TYPE = "C.UTF-8";

+2 -1

pkgs/development/interpreters/groovy/default.nix

···

       11
       11
        
           sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ unzip makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ unzip ];

     

       15
       16
        
       

     

       16
       17
        
         installPhase = ''

     

       17
       18
        
           mkdir -p $out

+1 -1

pkgs/development/interpreters/jruby/default.nix

···

       13
       13
        
           sha256 = "1dg0fz9b8m1k0sypvpxnf4xjqwc0pyy35xw4rsg4a7pha4jkprrj";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
        
       

     

       18
       18
        
         installPhase = ''

     

       19
       19
        
            mkdir -pv $out/docs

+1 -1

pkgs/development/interpreters/jython/default.nix

···

       10
       10
        
           sha256 = "142285hd9mx0nx5zw0jvkpqkb4kbhgyyy52p5bj061ya8bg5jizy";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
       

     

       15
       15
        
         dontUnpack = true;

     

       16
       16

+2 -1

pkgs/development/interpreters/picolisp/default.nix

···

       8
       8
        
           url = "https://www.software-lab.de/${pname}-${version}.tgz";

     

       9
       9
        
           sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2";

     

       10
       10
        
         };

     

       11
       11
       -
         buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [openssl] ++ optional stdenv.is64bit jdk;

     

       12
       13
        
         patchPhase = ''

     

       13
       14
        
           sed -i "s/which java/command -v java/g" mkAsm

     

       14
       15

+2 -1

pkgs/development/interpreters/pure/default.nix

···

       11
       11
        
           sha256="0px6x5ivcdbbp2pz5n1r1cwg1syadklhjw8piqhl63n91i4r7iyb";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ bison flex makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ bison flex ];

     

       15
       16
        
         propagatedBuildInputs = [ llvm gmp mpfr readline ];

     

       16
       17
        
         NIX_LDFLAGS = "-lLLVMJIT";

     

       17
       18

+2 -1

pkgs/development/interpreters/rakudo/zef.nix

···

       11
       11
        
           sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ rakudo makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ rakudo ];

     

       15
       16
        
       

     

       16
       17
        
         installPhase = ''

     

       17
       18
        
           mkdir -p "$out"

+2 -1

pkgs/development/interpreters/rascal/default.nix

···

       8
       8
        
           sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ makeWrapper jdk ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ jdk ];

     

       12
       13
        
       

     

       13
       14
        
         dontUnpack = true;

     

       14
       15

+1 -1

pkgs/development/libraries/hunspell/wrapper.nix

···

       5
       5
        
       in

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         name = (appendToName "with-dicts" hunspell).name;

     

       8
       8
       -
         buildInputs = [ makeWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ makeWrapper ];

     

       9
       9
        
         buildCommand = ''

     

       10
       10
        
           makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath}

     

       11
       11
        
         '';

+1 -1

pkgs/development/libraries/java/lombok/default.nix

···

       8
       8
        
           sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
        
       

     

       13
       13
        
         outputs = [ "out" "bin" ];

     

       14
       14

+2 -2

pkgs/development/libraries/neardal/default.nix

···

       10
       10
        
           sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ pkg-config ];

     

       14
       14
       -
         buildInputs = [ autoconf automake libtool glib readline makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       14
       14
       +
         buildInputs = [ autoconf automake libtool glib readline ];

     

       15
       15
        
       

     

       16
       16
        
         preConfigure = ''

     

       17
       17
        
           substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS"

+1 -1

pkgs/development/libraries/nuspell/wrapper.nix

···

       5
       5
        
       in

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         name = (appendToName "with-dicts" nuspell).name;

     

       8
       8
       -
         buildInputs = [ makeWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ makeWrapper ];

     

       9
       9
        
         buildCommand = ''

     

       10
       10
        
           makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath}

     

       11
       11
        
         '';

+2 -1

pkgs/development/libraries/rabbitmq-java-client/default.nix

···

       8
       8
        
           sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ ant jdk python makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ ant jdk python ];

     

       12
       13
        
       

     

       13
       14
        
         buildPhase = "ant dist";

     

       14
       15

+2 -1

pkgs/development/mobile/genymotion/default.nix

···

       18
       18
        
           sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [ makeWrapper which xdg-utils ];

     

       21
       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       +
         buildInputs = [ which xdg-utils ];

     

       22
       23
        
       

     

       23
       24
        
         unpackPhase = ''

     

       24
       25
        
           mkdir -p phony-home $out/share/applications

+2 -1

pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix

···

       64
       64
        
         }

     

       65
       65
        
         else throw "Platform: ${stdenv.system} not supported!";

     

       66
       66
        
       

     

       67
       67
       -
         buildInputs = [ unzip makeWrapper ];

     

       67
       67
       +
         nativeBuildInputs = [ makeWrapper ];

     

       68
       68
       +
         buildInputs = [ unzip ];

     

       68
       69
        
       

     

       69
       70
        
         buildCommand = ''

     

       70
       71
        
           mkdir -p $out

+2 -1

pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix

···

       64
       64
        
         }

     

       65
       65
        
         else throw "Platform: ${stdenv.system} not supported!";

     

       66
       66
        
       

     

       67
       67
       -
         buildInputs = [ unzip makeWrapper ];

     

       67
       67
       +
         nativeBuildInputs = [ makeWrapper ];

     

       68
       68
       +
         buildInputs = [ unzip ];

     

       68
       69
        
       

     

       69
       70
        
         buildCommand = ''

     

       70
       71
        
           mkdir -p $out

+2 -1

pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix

···

       64
       64
        
         }

     

       65
       65
        
         else throw "Platform: ${stdenv.system} not supported!";

     

       66
       66
        
       

     

       67
       67
       -
         buildInputs = [ unzip makeWrapper ];

     

       67
       67
       +
         nativeBuildInputs = [ makeWrapper ];

     

       68
       68
       +
         buildInputs = [ unzip ];

     

       68
       69
        
       

     

       69
       70
        
         buildCommand = ''

     

       70
       71
        
           mkdir -p $out

+2 -3

pkgs/development/ocaml-modules/ocsigen-server/default.nix

···

       29
       29
        
           sha256 = "0xda4fj8p5102lh9xmrn5mv3s0ps6yykqj3mpjf72gf4zd6fzcn7";

     

       30
       30
        
         }) ];

     

       31
       31
        
       

     

       32
       32
       -
         buildInputs = [ which makeWrapper ocaml findlib

     

       33
       33
       -
           lwt_react pgocaml camlzip ocaml_sqlite3

     

       34
       34
       -
         ];

     

       32
       32
       +
         nativeBuildInputs = [ makeWrapper ];

     

       33
       33
       +
         buildInputs = [ which ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ];

     

       35
       34
        
       

     

       36
       35
        
         propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet

     

       37
       36
        
           ocaml_pcre tyxml xml-light

+1 -1

pkgs/development/perl-modules/ham/default.nix

···

       13
       13
        
       

     

       14
       14
        
         outputs = [ "out" ];

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
        
         propagatedBuildInputs = [ openssh GitRepository URI XMLMini ];

     

       18
       18
        
       

     

       19
       19
        
         preConfigure = ''

+1 -1

pkgs/development/python-modules/buildbot/default.nix

···

       9
       9
        
         withPlugins = plugins: buildPythonPackage {

     

       10
       10
        
           name = "${package.name}-with-plugins";

     

       11
       11
        
           phases = [ "installPhase" "fixupPhase" ];

     

       12
       12
       -
           buildInputs = [ makeWrapper ];

     

       12
       12
       +
           nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
           propagatedBuildInputs = plugins ++ package.propagatedBuildInputs;

     

       14
       14
        
       

     

       15
       15
        
           installPhase = ''

+1 -1

pkgs/development/python-modules/livestreamer/default.nix

···

       19
       19
        
           sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ pkgs.makeWrapper ];

     

       22
       22
       +
         nativeBuildInputs = [ pkgs.makeWrapper ];

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ]

     

       25
       25
        
           ++ lib.optionals isPy27 [ singledispatch futures ];

+1 -1

pkgs/development/python-modules/pyxml/default.nix

···

       10
       10
        
           sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
         buildPhase = "${python.interpreter} ./setup.py build";

     

       15
       15
        
         installPhase = ''

     

       16
       16
        
           ${python.interpreter} ./setup.py install --prefix="$out" || exit 1

+2 -1

pkgs/development/tools/analysis/lcov/default.nix

···

       11
       11
        
           sha256 = "1kvc7fkp45w48f0bxwbxvxkicnjrrydki0hllg294n1wrp80zzyk";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ perl makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ perl ];

     

       15
       16
        
       

     

       16
       17
        
         preBuild = ''

     

       17
       18
        
           patchShebangs bin/

+1 -2

pkgs/development/tools/analysis/panopticon/default.nix

···

       12
       12
        
           sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       16
       16
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ cmake pkg-config makeWrapper ];

     

       17
       16
        
         propagatedBuildInputs = with qt5; [

     

       18
       17
        
            qt5.qtbase

     

       19
       18
        
            qtdeclarative

+1 -1

pkgs/development/tools/build-managers/apache-ant/1.9.nix

···

       6
       6
        
         pname = "ant";

     

       7
       7
        
         inherit version;

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ makeWrapper ];

     

       9
       9
       +
         nativeBuildInputs = [ makeWrapper ];

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";

+1 -1

pkgs/development/tools/build-managers/apache-ant/default.nix

···

       6
       6
        
         pname = "ant";

     

       7
       7
        
         inherit version;

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ makeWrapper ];

     

       9
       9
       +
         nativeBuildInputs = [ makeWrapper ];

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";

+1 -1

pkgs/development/tools/build-managers/apache-maven/default.nix

···

       14
       14
        
           sha256 = "1i9qlj3vy4j1yyf22nwisd0pg88n9qzp9ymfhwqabadka7br3b96";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         inherit jdk;

     

       20
       20

+2 -1

pkgs/development/tools/build-managers/gradle/default.nix

···

       33
       33
        
               echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies

     

       34
       34
        
             '';

     

       35
       35
        
       

     

       36
       36
       -
           buildInputs = [ unzip java makeWrapper ];

     

       36
       36
       +
           nativeBuildInputs = [ makeWrapper ];

     

       37
       37
       +
           buildInputs = [ unzip java ];

     

       37
       38
        
       

     

       38
       39
        
           meta = {

     

       39
       40
        
             description = "Enterprise-grade build system";

+1 -1

pkgs/development/tools/build-managers/leiningen/default.nix

···

       20
       20
        
       

     

       21
       21
        
         dontUnpack = true;

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ makeWrapper ];

     

       23
       23
       +
         nativeBuildInputs = [ makeWrapper ];

     

       24
       24
        
         propagatedBuildInputs = [ jdk ];

     

       25
       25
        
       

     

       26
       26
        
         # the jar is not in share/java, because it's a standalone jar and should

+1 -1

pkgs/development/tools/build-managers/redo-sh/default.nix

···

       9
       9
        
           sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
         sourceRoot = ".";

     

       15
       15
        
         installPhase = ''

+1 -1

pkgs/development/tools/build-managers/sbt-extras/default.nix

···

       16
       16
        
       

     

       17
       17
        
         dontBuild = true;

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ makeWrapper ];

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
        
       

     

       21
       21
        
         installPhase = ''

     

       22
       22
        
           mkdir -p $out/bin

+1 -1

pkgs/development/tools/database/ephemeralpg/default.nix

···

       6
       6
        
           url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz";

     

       7
       7
        
           sha256 = "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6";

     

       8
       8
        
         };

     

       9
       9
       -
         buildInputs = [ makeWrapper ];

     

       9
       9
       +
         nativeBuildInputs = [ makeWrapper ];

     

       10
       10
        
         installPhase = ''

     

       11
       11
        
           mkdir -p $out

     

       12
       12
        
           PREFIX=$out make install

+2 -1

pkgs/development/tools/database/liquibase/default.nix

···

       17
       17
        
           sha256 = "sha256-Zwh8baMD8jt+yfsK0jpsTEU32rT+IAQGwavVT3rpRsU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ jre makeWrapper ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         buildInputs = [ jre ];

     

       21
       22
        
       

     

       22
       23
        
         unpackPhase = ''

     

       23
       24
        
           tar xfz ${src}

+2 -1

pkgs/development/tools/database/sqldeveloper/default.nix

···

       49
       49
        
           sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";

     

       50
       50
        
         };

     

       51
       51
        
       

     

       52
       52
       -
         buildInputs = [ makeWrapper unzip ];

     

       52
       52
       +
         nativeBuildInputs = [ makeWrapper ];

     

       53
       53
       +
         buildInputs = [ unzip ];

     

       53
       54
        
       

     

       54
       55
        
         unpackCmd = "unzip $curSrc";

     

       55
       56

+2 -1

pkgs/development/tools/google-app-engine-go-sdk/default.nix

···

       17
       17
        
               sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp";

     

       18
       18
        
             };

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ python makeWrapper ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         buildInputs = [ python ];

     

       21
       22
        
       

     

       22
       23
        
         installPhase = ''

     

       23
       24
        
           mkdir -p $out/bin $out/share/

+2 -1

pkgs/development/tools/jbake/default.nix

···

       9
       9
        
           sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper jre ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ jre ];

     

       13
       14
        
       

     

       14
       15
        
         postPatch = "patchShebangs .";

     

       15
       16

+2 -1

pkgs/development/tools/jsduck/default.nix

···

       13
       13
        
       

     

       14
       14
        
         phases = [ "installPhase" ];

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ env makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
         buildInputs = [ env ];

     

       17
       18
        
       

     

       18
       19
        
         installPhase = ''

     

       19
       20
        
           mkdir -p $out/bin

+2 -1

pkgs/development/tools/misc/autobuild/default.nix

···

       8
       8
        
           sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ makeWrapper perl openssh rsync ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ perl openssh rsync ];

     

       12
       13
        
       

     

       13
       14
        
         doCheck = true;

     

       14
       15

+2 -1

pkgs/development/tools/misc/cbrowser/default.nix

···

       10
       10
        
       

     

       11
       11
        
         patches = [ ./backslashes-quotes.diff ];

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ tk makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ tk ];

     

       14
       15
        
       

     

       15
       16
        
         installPhase = ''

     

       16
       17
        
           mkdir -p $out/bin $out/share/${name}

+1 -1

pkgs/development/tools/misc/clojure-lsp/default.nix

···

       11
       11
        
       

     

       12
       12
        
         dontUnpack = true;

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           install -Dm644 $src $out/share/java/${pname}.jar

+2 -1

pkgs/development/tools/misc/dejagnu/default.nix

···

       8
       8
        
           sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ expect makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ expect ];

     

       12
       13
        
       

     

       13
       14
        
         doCheck = true;

     

       14
       15

+2 -2

pkgs/development/tools/misc/fswatch/default.nix

···

       20
       20
        
           sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];

     

       24
       24
       -
         buildInputs = [ gettext libtool makeWrapper texinfo ];

     

       23
       23
       +
         nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];

     

       24
       24
       +
         buildInputs = [ gettext libtool texinfo ];

     

       25
       25
        
       

     

       26
       26
        
         enableParallelBuilding = true;

     

       27
       27

+2 -2

pkgs/development/tools/misc/gpshell/default.nix

···

       11
       11
        
           sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkg-config ];

     

       15
       15
       -
         buildInputs = [ globalplatform pcsclite makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       15
       15
       +
         buildInputs = [ globalplatform pcsclite ];

     

       16
       16
        
       

     

       17
       17
        
         postFixup = ''

     

       18
       18
        
           wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"

+1 -1

pkgs/development/tools/misc/kibana/6.x.nix

···

       42
       42
        
           ./disable-nodejs-version-check.patch

     

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
       -
         buildInputs = [ makeWrapper ];

     

       45
       45
       +
         nativeBuildInputs = [ makeWrapper ];

     

       46
       46
        
       

     

       47
       47
        
         installPhase = ''

     

       48
       48
        
           mkdir -p $out/libexec/kibana $out/bin

+1 -1

pkgs/development/tools/misc/kibana/7.x.nix

···

       42
       42
        
           ./disable-nodejs-version-check-7.patch

     

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
       -
         buildInputs = [ makeWrapper ];

     

       45
       45
       +
         nativeBuildInputs = [ makeWrapper ];

     

       46
       46
        
       

     

       47
       47
        
         installPhase = ''

     

       48
       48
        
           mkdir -p $out/libexec/kibana $out/bin

+1 -1

pkgs/development/tools/misc/macdylibbundler/default.nix

···

       11
       11
        
           sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       17
       17

+1 -1

pkgs/development/tools/misc/rolespec/default.nix

···

       12
       12
        
           inherit name;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         # The default build phase (`make`) runs the test code. It's difficult to do

     

       18
       18
        
         # the test in the build environment because it depends on the system package

+1 -1

pkgs/development/tools/neoload/default.nix

···

       41
       41
        
             { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh";

     

       42
       42
        
               sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } );

     

       43
       43
        
       

     

       44
       44
       -
         buildInputs = [ makeWrapper ];

     

       44
       44
       +
         nativeBuildInputs = [ makeWrapper ];

     

       45
       45
        
         phases = [ "installPhase" ];

     

       46
       46
        
       

     

       47
       47
        
         # TODO: load generator / monitoring agent only builds

+1 -1

pkgs/development/tools/node-webkit/nw12.nix

···

       49
       49
        
           ln -s $out/share/nwjs/nwjc $out/bin

     

       50
       50
        
         '';

     

       51
       51
        
       

     

       52
       52
       -
         buildInputs = [ makeWrapper ];

     

       52
       52
       +
         nativeBuildInputs = [ makeWrapper ];

     

       53
       53
        
       

     

       54
       54
        
         meta = with lib; {

     

       55
       55
        
           description = "An app runtime based on Chromium and node.js";

+2 -1

pkgs/development/tools/nrpl/default.nix

···

       11
       11
        
           sha256 = "1cly9lhrawnc42r31b7r0p0i6hcx8r00aa17gv7w9pcpj8ngb4v2";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper nim pcre ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ nim pcre ];

     

       15
       16
        
       

     

       16
       17
        
         patches = [

     

       17
       18
        
           (fetchpatch {

+1 -1

pkgs/development/tools/nwjs/default.nix

···

       83
       83
        
             ln -s $out/share/nwjs/nw $out/bin

     

       84
       84
        
         '';

     

       85
       85
        
       

     

       86
       86
       -
         buildInputs = [ makeWrapper ];

     

       86
       86
       +
         nativeBuildInputs = [ makeWrapper ];

     

       87
       87
        
       

     

       88
       88
        
         meta = with lib; {

     

       89
       89
        
           description = "An app runtime based on Chromium and node.js";

+2 -1

pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix

···

       20
       20
        
         patchFlags = [ "-p0" ];

     

       21
       21
        
         patches = [ ./warn.patch ];

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ ocaml makeWrapper ncurses ];

     

       23
       23
       +
         nativeBuildInputs = [ makeWrapper ];

     

       24
       24
       +
         buildInputs = [ ocaml ncurses ];

     

       24
       25
        
       

     

       25
       26
        
         phases = "unpackPhase patchPhase buildPhase";

     

       26
       27
        
         buildPhase = ''

+2 -1

pkgs/development/tools/ocaml/opam/1.2.2.nix

···

       47
       47
        
         pname = "opam";

     

       48
       48
        
         version = "1.2.2";

     

       49
       49
        
       

     

       50
       50
       -
         buildInputs = [ unzip curl ncurses ocaml makeWrapper ];

     

       50
       50
       +
         nativeBuildInputs = [ makeWrapper ];

     

       51
       51
       +
         buildInputs = [ unzip curl ncurses ocaml ];

     

       51
       52
        
       

     

       52
       53
        
         src = srcs.opam;

     

       53
       54

+2 -1

pkgs/development/tools/ocaml/opam/default.nix

···

       63
       63
        
         pname = "opam";

     

       64
       64
        
         version = "2.0.8";

     

       65
       65
        
       

     

       66
       66
       -
         buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;

     

       66
       66
       +
         nativeBuildInputs = [ makeWrapper ];

     

       67
       67
       +
         buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;

     

       67
       68
        
       

     

       68
       69
        
         src = srcs.opam;

     

       69
       70

+2 -1

pkgs/development/tools/operator-sdk/default.nix

···

       17
       17
        
       

     

       18
       18
        
         subPackages = [ "cmd/operator-sdk" ];

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ go makeWrapper ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         buildInputs = [ go ];

     

       21
       22
        
       

     

       22
       23
        
         # operator-sdk uses the go compiler at runtime

     

       23
       24
        
         allowGoReference = true;

+1 -1

pkgs/development/tools/out-of-tree/default.nix

···

       4
       4
        
         pname = "out-of-tree";

     

       5
       5
        
         version = "1.4.0";

     

       6
       6
        
       

     

       7
       7
       -
         buildInputs = [ makeWrapper ];

     

       7
       7
       +
         nativeBuildInputs = [ makeWrapper ];

     

       8
       8
        
       

     

       9
       9
        
         src = fetchgit {

     

       10
       10
        
           rev = "refs/tags/v${version}";

+1 -1

pkgs/development/tools/profiling/systemtap/default.nix

···

       37
       37
        
       

     

       38
       38
        
       in runCommand "systemtap-${kernel.version}-${version}" {

     

       39
       39
        
         inherit stapBuild kernelBuildDir;

     

       40
       40
       -
         buildInputs = [ makeWrapper ];

     

       40
       40
       +
         nativeBuildInputs = [ makeWrapper ];

     

       41
       41
        
         meta = {

     

       42
       42
        
           homepage = "https://sourceware.org/systemtap/";

     

       43
       43
        
           repositories.git = url;

+2 -1

pkgs/development/tools/quilt/default.nix

···

       9
       9
        
           sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ perl bash diffutils patch findutils diffstat ];

     

       13
       14
        
       

     

       14
       15
        
         postInstall = ''

     

       15
       16
        
           wrapProgram $out/bin/quilt --prefix PATH : \

+1 -1

pkgs/development/tools/ronn/default.nix

···

       11
       11
        
       

     

       12
       12
        
         phases = ["installPhase"];

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           mkdir -p $out/bin

+2 -1

pkgs/development/tools/scalafix/default.nix

···

       19
       19
        
       stdenv.mkDerivation {

     

       20
       20
        
         name = "${baseName}-${version}";

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ jdk makeWrapper deps ];

     

       22
       22
       +
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       +
         buildInputs = [ jdk deps ];

     

       23
       24
        
       

     

       24
       25
        
         doCheck = true;

     

       25
       26

+2 -1

pkgs/development/tools/selenium/selendroid/default.nix

···

       23
       23
        
       

     

       24
       24
        
         dontUnpack = true;

     

       25
       25
        
       

     

       26
       26
       -
         buildInputs = [ jdk makeWrapper ];

     

       26
       26
       +
         nativeBuildInputs = [ makeWrapper ];

     

       27
       27
       +
         buildInputs = [ jdk ];

     

       27
       28
        
       

     

       28
       29
        
         installPhase = ''

     

       29
       30
        
           mkdir -p $out/share/lib/selendroid

+2 -1

pkgs/development/tools/selenium/server/default.nix

···

       18
       18
        
       

     

       19
       19
        
         dontUnpack = true;

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [ jre makeWrapper ];

     

       21
       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       +
         buildInputs = [ jre ];

     

       22
       23
        
       

     

       23
       24
        
         installPhase = ''

     

       24
       25
        
           mkdir -p $out/share/lib/${pname}-${version}

+2 -1

pkgs/development/tools/sslmate/default.nix

···

       10
       10
        
       

     

       11
       11
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ perlPackages.perl makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ perlPackages.perl ];

     

       14
       15
        
       

     

       15
       16
        
         postInstall = ''

     

       16
       17
        
           wrapProgram $out/bin/sslmate --prefix PERL5LIB : \

+2 -1

pkgs/development/tools/thrust/default.nix

···

       22
       22
        
           sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         buildInputs = [ thrustEnv makeWrapper unzip ];

     

       25
       25
       +
         nativeBuildInputs = [ makeWrapper ];

     

       26
       26
       +
         buildInputs = [ thrustEnv unzip ];

     

       26
       27
        
       

     

       27
       28
        
         phases = [ "installPhase" "fixupPhase" ];

     

       28
       29

+2 -1

pkgs/games/airstrike/default.nix

···

       9
       9
        
           sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper SDL SDL_image ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ SDL SDL_image ];

     

       13
       14
        
       

     

       14
       15
        
         NIX_LDFLAGS = "-lm";

     

       15
       16

+2 -1

pkgs/games/chessdb/default.nix

···

       8
       8
        
           sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ tcl tk libX11 makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ tcl tk libX11 ];

     

       12
       13
        
       

     

       13
       14
        
         makeFlags = [

     

       14
       15
        
           "BINDIR=$(out)/bin"

+2 -1

pkgs/games/ckan/default.nix

···

       11
       11
        
       

     

       12
       12
        
         dontUnpack = true;

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper mono ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ mono ];

     

       15
       16
        
       

     

       16
       17
        
         libraries = lib.makeLibraryPath [ gtk2 curl ];

     

       17
       18

+1 -1

pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix

···

       14
       14
        
       

     

       15
       15
        
         paths = [ dwarf-therapist ];

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         passthru = { inherit dwarf-fortress dwarf-therapist; };

     

       20
       20

+2 -1

pkgs/games/factorio/default.nix

···

       178
       178
        
           headless = base;

     

       179
       179
        
           demo = base // {

     

       180
       180
        
       

     

       181
       181
       -
             buildInputs = [ makeWrapper libpulseaudio ];

     

       181
       181
       +
             nativeBuildInputs = [ makeWrapper ];

     

       182
       182
       +
             buildInputs = [ libpulseaudio ];

     

       182
       183
        
       

     

       183
       184
        
             libPath = lib.makeLibraryPath [

     

       184
       185
        
               alsaLib

+2 -1

pkgs/games/gcs/default.nix

···

       42
       42
        
           cp -r ${library} gcs_library

     

       43
       43
        
         '';

     

       44
       44
        
       

     

       45
       45
       -
         buildInputs = [ jdk8 jre8 ant makeWrapper ];

     

       45
       45
       +
         nativeBuildInputs = [ makeWrapper ];

     

       46
       46
       +
         buildInputs = [ jdk8 jre8 ant ];

     

       46
       47
        
         buildPhase = ''

     

       47
       48
        
           cd apple_stubs

     

       48
       49
        
           ant

+2 -1

pkgs/games/gogui/default.nix

···

       5
       5
        
       in stdenv.mkDerivation {

     

       6
       6
        
         pname = "gogui";

     

       7
       7
        
         inherit version;

     

       8
       8
       -
         buildInputs = [ unzip makeWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ makeWrapper ];

     

       9
       9
       +
         buildInputs = [ unzip ];

     

       9
       10
        
         src = fetchurl {

     

       10
       11
        
           url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";

     

       11
       12
        
           sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j";

+2 -1

pkgs/games/gtypist/default.nix

···

       9
       9
        
           sha256 = "0xzrkkmj0b1dw3yr0m9hml2y634cc4h61im6zwcq57s7285z8fn1";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ncurses perl fortune ]

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ ncurses perl fortune ]

     

       13
       14
        
          ++ lib.optional stdenv.isDarwin libiconv;

     

       14
       15
        
       

     

       15
       16
        
         preFixup = ''

+1 -2

pkgs/games/mrrescue/default.nix

···

       29
       29
        
           sha256 = "0kzahxrgpb4vsk9yavy7f8nc34d62d1jqjrpsxslmy9ywax4yfpi";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
       -
         nativeBuildInputs = [ lua love ];

     

       33
       33
       -
         buildInputs = [ makeWrapper ];

     

       32
       32
       +
         nativeBuildInputs = [ lua love makeWrapper ];

     

       34
       33
        
       

     

       35
       34
        
         phases = "installPhase";

     

       36
       35

+2 -1

pkgs/games/newtonwars/default.nix

···

       11
       11
        
           sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper freeglut libGL libGLU ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ freeglut libGL libGLU ];

     

       15
       16
        
       

     

       16
       17
        
         patchPhase = ''

     

       17
       18
        
           sed -i "s;font24.raw;$out/share/font24.raw;g" display.c

+2 -2

pkgs/games/nottetris2/default.nix

···

       25
       25
        
           sha256 = "17iabh6rr8jim70n96rbhif4xq02g2kppscm8l339yqx6mhb64hs";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         nativeBuildInputs = [ zip ];

     

       29
       29
       -
         buildInputs = [ love_0_7 makeWrapper ];

     

       28
       28
       +
         nativeBuildInputs = [ zip makeWrapper ];

     

       29
       29
       +
         buildInputs = [ love_0_7 ];

     

       30
       30
        
       

     

       31
       31
        
         phases = [ "unpackPhase" "installPhase" ];

     

       32
       32

+1 -1

pkgs/games/r2mod_cli/default.nix

···

       16
       16
        
           sha256 = "1g64f8ms7yz4rzm6xb93agc08kh9sbwkhvq35dpfhvi6v59j3n5m";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ makeWrapper ];

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
        
       

     

       21
       21
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       22
       22

+2 -2

pkgs/games/racer/default.nix

···

       12
       12
        
         } else

     

       13
       13
        
           throw "System not supported";

     

       14
       14
        
       

     

       15
       15
       -
       

     

       16
       16
       -
         buildInputs = [ allegro libjpeg makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = [ allegro libjpeg ];

     

       17
       17
        
       

     

       18
       18
        
         prePatch = ''

     

       19
       19
        
           sed -i s,/usr/local,$out, Makefile src/HGFX.cpp src/STDH.cpp

+1 -1

pkgs/games/runelite/default.nix

···

       27
       27
        
           startupNotify = null;

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         buildInputs = [ makeWrapper ];

     

       30
       30
       +
         nativeBuildInputs = [ makeWrapper ];

     

       31
       31
        
       

     

       32
       32
        
         # colon is bash form of no-op (do nothing)

     

       33
       33
        
         dontUnpack = true;

+2 -1

pkgs/games/scid/default.nix

···

       9
       9
        
           sha256 = "0zb5qp04x8w4gn2kvfdfq2p44kmzfcqn7v167dixz6nlyxg41hrw";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ tcl tk libX11 zlib makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ tcl tk libX11 zlib ];

     

       13
       14
        
       

     

       14
       15
        
         prePatch = ''

     

       15
       16
        
           sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \

+2 -1

pkgs/games/sil/default.nix

···

       18
       18
        
           stripRoot=false;

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [ makeWrapper ncurses libX11 libXaw libXt libXext libXmu ];

     

       21
       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       +
         buildInputs = [ ncurses libX11 libXaw libXt libXext libXmu ];

     

       22
       23
        
       

     

       23
       24
        
         sourceRoot = "source/Sil/src";

     

       24
       25

+1 -1

pkgs/games/vassal/default.nix

···

       9
       9
        
           sha256 = "0xn403fxz6ay5lv8whyfdq611kvxj5q309bj317yw5cxbb08w1yb";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

     

       15
       15
        
           mkdir -p $out/bin $out/share/vassal $out/doc

+2 -1

pkgs/games/zod/default.nix

···

       24
       24
        
           sourceRoot=`pwd`/src

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       -
         buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ];

     

       27
       27
       +
         nativeBuildInputs = [ makeWrapper ];

     

       28
       28
       +
         buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ];

     

       28
       29
        
       

     

       29
       30
        
         NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";

     

       30
       31

+2 -1

pkgs/misc/emulators/blastem/default.nix

···

       25
       25
        
           url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz";

     

       26
       26
        
           sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r";

     

       27
       27
        
         };

     

       28
       28
       -
         buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm makeWrapper ];

     

       28
       28
       +
         nativeBuildInputs = [ makeWrapper ];

     

       29
       29
       +
         buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm ];

     

       29
       30
        
         preBuild = ''

     

       30
       31
        
           patchShebangs img2tiles.py

     

       31
       32
        
         '';

+1 -1

pkgs/misc/emulators/retroarch/wrapper.nix

···

       4
       4
        
         pname = "retroarch";

     

       5
       5
        
         version = lib.getVersion retroarch;

     

       6
       6
        
       

     

       7
       7
       -
         buildInputs = [ makeWrapper ];

     

       7
       7
       +
         nativeBuildInputs = [ makeWrapper ];

     

       8
       8
        
       

     

       9
       9
        
         buildCommand = ''

     

       10
       10
        
           mkdir -p $out/lib

+2 -1

pkgs/misc/lilypond/with-fonts.nix

···

       7
       7
        
       

     

       8
       8
        
         paths = [ lilypond ] ++ openlilylib-fonts.all;

     

       9
       9
        
       

     

       10
       10
       -
         buildInputs = [ makeWrapper lndir ];

     

       10
       10
       +
         nativeBuildInputs = [ makeWrapper ];

     

       11
       11
       +
         buildInputs = [ lndir ];

     

       11
       12
        
       

     

       12
       13
        
         postBuild = ''

     

       13
       14
        
           for p in $out/bin/*; do

+1 -1

pkgs/misc/screensavers/pipes/default.nix

···

       9
       9
        
           sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

     

       15
       15
        
           mkdir $out -p

+2 -2

pkgs/os-specific/linux/alsa-utils/default.nix

···

       9
       9
        
           sha256 = "09m4dnn4kplawprd2bl15nwa0b4r1brab3x44ga7f1fyk7aw5zwq";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = [ gettext ];

     

       13
       13
       -
         buildInputs = [ makeWrapper alsaLib ncurses libsamplerate fftw ];

     

       12
       12
       +
         nativeBuildInputs = [ gettext makeWrapper ];

     

       13
       13
       +
         buildInputs = [ alsaLib ncurses libsamplerate fftw ];

     

       14
       14
        
       

     

       15
       15
        
         configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];

     

       16
       16

+2 -2

pkgs/os-specific/linux/lxcfs/default.nix

···

       14
       14
        
           sha256 = "sha256-gC1Q+kG/oKfYvuHVKstpRWfL/thsemULrimPrV/eeaI=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ pkg-config help2man autoreconfHook ];

     

       18
       18
       -
         buildInputs = [ fuse makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ];

     

       18
       18
       +
         buildInputs = [ fuse ];

     

       19
       19
        
       

     

       20
       20
        
         preConfigure = lib.optionalString enableDebugBuild ''

     

       21
       21
        
           sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am

+2 -2

pkgs/os-specific/linux/openvswitch/default.nix

···

       18
       18
        
       

     

       19
       19
        
         kernel = optional (_kernel != null) _kernel.dev;

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ pkg-config ];

     

       22
       22
       -
         buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv

     

       21
       21
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       22
       22
       +
         buildInputs = [ util-linux openssl libcap_ng pythonEnv

     

       23
       23
        
                         perl procps which ];

     

       24
       24
        
       

     

       25
       25
        
         configureFlags = [

+2 -3

pkgs/os-specific/linux/openvswitch/lts.nix

···

       19
       19
        
       

     

       20
       20
        
         kernel = optional (_kernel != null) _kernel.dev;

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ autoconf libtool automake pkg-config  ];

     

       23
       23
       -
         buildInputs = [ makeWrapper util-linux openssl libcap_ng python2

     

       24
       24
       -
                         perl procps which ];

     

       22
       22
       +
         nativeBuildInputs = [ autoconf libtool automake pkg-config makeWrapper ];

     

       23
       23
       +
         buildInputs = [ util-linux openssl libcap_ng python2 perl procps which ];

     

       25
       24
        
       

     

       26
       25
        
         preConfigure = "./boot.sh";

     

       27
       26

+1 -1

pkgs/os-specific/linux/pipework/default.nix

···

       11
       11
        
           rev = "ae42f1b5fef82b3bc23fe93c95c345e7af65fef3";

     

       12
       12
        
           sha256 = "0c342m0bpq6ranr7dsxk9qi5mg3j5aw9wv85ql8gprdb2pz59qy8";

     

       13
       13
        
         };

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
         installPhase = ''

     

       16
       16
        
           install -D pipework $out/bin/pipework

     

       17
       17
        
           wrapProgram $out/bin/pipework --prefix PATH : \

+2 -2

pkgs/os-specific/linux/syslinux/default.nix

···

       63
       63
        
           touch gnu-efi/inc/ia32/gnu/stubs-32.h

     

       64
       64
        
         '';

     

       65
       65
        
       

     

       66
       66
       -
         nativeBuildInputs = [ nasm perl python3 ];

     

       67
       67
       -
         buildInputs = [ libuuid makeWrapper ];

     

       66
       66
       +
         nativeBuildInputs = [ nasm perl python3 makeWrapper ];

     

       67
       67
       +
         buildInputs = [ libuuid ];

     

       68
       68
        
       

     

       69
       69
        
         enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...'

     

       70
       70
        
         hardeningDisable = [ "pic" "stackprotector" "fortify" ];

+2 -1

pkgs/servers/apache-kafka/default.nix

···

       29
       29
        
           inherit sha256;

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
       -
         buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ps ];

     

       32
       32
       +
         nativeBuildInputs = [ makeWrapper ];

     

       33
       33
       +
         buildInputs = [ jre bash gnugrep gnused coreutils ps ];

     

       33
       34
        
       

     

       34
       35
        
         installPhase = ''

     

       35
       36
        
           mkdir -p $out

+2 -1

pkgs/servers/confluent-platform/default.nix

···

       18
       18
        
           sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [ jre makeWrapper bash ];

     

       21
       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       +
         buildInputs = [ jre bash ];

     

       22
       23
        
       

     

       23
       24
        
         installPhase = ''

     

       24
       25
        
           cp -R $confluentCli confluent-cli

+1 -2

pkgs/servers/exhibitor/default.nix

···

       31
       31
        
         # (given the state of Maven support in Nix). We're not actually building any java

     

       32
       32
        
         # source here.

     

       33
       33
        
         pomFileDir = "exhibitor-standalone/src/main/resources/buildscripts/standalone/maven";

     

       34
       34
       -
         nativeBuildInputs = [ maven ];

     

       35
       35
       -
         buildInputs = [ makeWrapper ];

     

       34
       34
       +
         nativeBuildInputs = [ maven makeWrapper ];

     

       36
       35
        
         buildPhase = ''

     

       37
       36
        
             cd ${pomFileDir}

     

       38
       37
        
             mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2

+1 -1

pkgs/servers/h2/default.nix

···

       9
       9
        
           sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
         installPhase =

     

       15
       15
        
           let

+1 -1

pkgs/servers/hbase/default.nix

···

       8
       8
        
           sha256 = "0kz72wqsii09v9hxkw10mzyvjhji5sx3l6aijjalgbybavpcxglb";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
        
         installPhase = ''

     

       13
       13
        
           mkdir -p $out

     

       14
       14
        
           cp -R * $out

+1 -1

pkgs/servers/jetbrains/youtrack.nix

···

       9
       9
        
           sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
         dontUnpack = true;

     

       15
       15

+1 -1

pkgs/servers/jitsi-videobridge/default.nix

···

       15
       15
        
       

     

       16
       16
        
         unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents";

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ makeWrapper ];

     

       18
       18
       +
         nativeBuildInputs = [ makeWrapper ];

     

       19
       19
        
       

     

       20
       20
        
         installPhase = ''

     

       21
       21
        
           runHook preInstall

+1 -1

pkgs/servers/mail/mailman/wrapped.nix

···

       8
       8
        
       

     

       9
       9
        
       runCommand "${mailman.name}-wrapped" {

     

       10
       10
        
         inherit (mailman) meta;

     

       11
       11
       -
         buildInputs = [ makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
        
         passthru = mailman.passthru // { unwrapped = mailman; };

     

       13
       13
        
       } ''

     

       14
       14
        
         mkdir -p "$out/bin"

+2 -1

pkgs/servers/mail/spamassassin/default.nix

···

       9
       9
        
           sha256 = "0ga5mi2nv2v91kakk9xakkg71rnxnddlzv76ca13vfyd4jgcfasf";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ] ++ (with perlPackages; [

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = (with perlPackages; [

     

       13
       14
        
           HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP

     

       14
       15
        
           IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF

     

       15
       16
        
           NetDNSResolverProgrammable Socket6

+2 -1

pkgs/servers/monitoring/fusion-inventory/default.nix

···

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         buildTools = [];

     

       27
       27
       -
         buildInputs = [ makeWrapper ] ++ (with perlPackages; [

     

       27
       27
       +
         nativeBuildInputs = [ makeWrapper ];

     

       28
       28
       +
         buildInputs = (with perlPackages; [

     

       28
       29
        
           CGI

     

       29
       30
        
           DataStructureUtil

     

       30
       31
        
           FileCopyRecursive

+2 -1

pkgs/servers/monitoring/longview/default.nix

···

       25
       25
        
               --replace /etc/linode /run/longview

     

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
       -
         buildInputs = [ perl makeWrapper glibc ]

     

       28
       28
       +
         nativeBuildInputs = [ makeWrapper ];

     

       29
       29
       +
         buildInputs = [ perl glibc ]

     

       29
       30
        
           ++ (with perlPackages; [

     

       30
       31
        
             LWP

     

       31
       32
        
             LWPProtocolHttps

+2 -1

pkgs/servers/monitoring/prometheus/jmx-httpserver.nix

···

       14
       14
        
           sha256 = "1pvqphrirq48xhmx0aa6vkxz6qy1cx2q6jxsh7rin432iap7j62f";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ jre makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
       +
         buildInputs = [ jre ];

     

       18
       19
        
       

     

       19
       20
        
         phases = "installPhase";

     

       20
       21

+2 -1

pkgs/servers/monitoring/seyren/default.nix

···

       11
       11
        
       

     

       12
       12
        
         phases = ["installPhase"];

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper jre ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ jre ];

     

       15
       16
        
       

     

       16
       17
        
         installPhase = ''

     

       17
       18
        
           mkdir -p "$out"/bin

+1 -1

pkgs/servers/monitoring/uchiwa/default.nix

···

       33
       33
        
       

     

       34
       34
        
         inherit src;

     

       35
       35
        
       

     

       36
       36
       -
         buildInputs = [ makeWrapper ];

     

       36
       36
       +
         nativeBuildInputs = [ makeWrapper ];

     

       37
       37
        
       

     

       38
       38
        
         buildCommand = ''

     

       39
       39
        
           mkdir -p $out/bin $out/public

+1 -1

pkgs/servers/monitoring/zipkin/default.nix

···

       6
       6
        
           url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar";

     

       7
       7
        
           sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa";

     

       8
       8
        
         };

     

       9
       9
       -
         buildInputs = [ makeWrapper ];

     

       9
       9
       +
         nativeBuildInputs = [ makeWrapper ];

     

       10
       10
        
       

     

       11
       11
        
         buildCommand =

     

       12
       12
        
         ''

+2 -1

pkgs/servers/nosql/neo4j/default.nix

···

       11
       11
        
           sha256 = "1zjb6cgk2lpzx6pq1cs5fh65in6b5ccpl1cgfiglgpjc948mnhzv";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper jre8 which gawk ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ jre8 which gawk ];

     

       15
       16
        
       

     

       16
       17
        
       

     

       17
       18
        
         installPhase = ''

+2 -2

pkgs/servers/nosql/rethinkdb/default.nix

···

       31
       31
        
       

     

       32
       32
        
         makeFlags = [ "rethinkdb" ];

     

       33
       33
        
       

     

       34
       34
       -
         buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ]

     

       34
       34
       +
         buildInputs = [ protobuf boost zlib curl openssl icu ]

     

       35
       35
        
           ++ lib.optional (!stdenv.isDarwin) jemalloc

     

       36
       36
        
           ++ lib.optional stdenv.isDarwin libtool;

     

       37
       37
        
       

     

       38
       38
       -
         nativeBuildInputs = [ which m4 python2Packages.python ];

     

       38
       38
       +
         nativeBuildInputs = [ which m4 python2Packages.python makeWrapper ];

     

       39
       39
        
       

     

       40
       40
        
         enableParallelBuilding = true;

     

       41
       41

+2 -1

pkgs/servers/sabnzbd/default.nix

···

       30
       30
        
           sha256 = "0m39r2il7d014kf2p6v28lw2hzshm6bhhdchqa8wzyvvmygqmwf2";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
       -
         buildInputs = [ pythonEnv makeWrapper ];

     

       33
       33
       +
         nativeBuildInputs = [ makeWrapper ];

     

       34
       34
       +
         buildInputs = [ pythonEnv ];

     

       34
       35
        
       

     

       35
       36
        
         installPhase = ''

     

       36
       37
        
           mkdir -p $out

+2 -1

pkgs/servers/search/elasticsearch/6.x.nix

···

       35
       35
        
             "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""

     

       36
       36
        
         '';

     

       37
       37
        
       

     

       38
       38
       -
         buildInputs = [ makeWrapper jre_headless util-linux ]

     

       38
       38
       +
         nativeBuildInputs = [ makeWrapper ];

     

       39
       39
       +
         buildInputs = [ jre_headless util-linux ]

     

       39
       40
        
                    ++ optional enableUnfree zlib;

     

       40
       41
        
       

     

       41
       42
        
         installPhase = ''

+2 -1

pkgs/servers/search/elasticsearch/7.x.nix

···

       46
       46
        
             "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""

     

       47
       47
        
         '';

     

       48
       48
        
       

     

       49
       49
       -
         buildInputs = [ makeWrapper jre_headless util-linux ]

     

       49
       49
       +
         nativeBuildInputs = [ makeWrapper ];

     

       50
       50
       +
         buildInputs = [ jre_headless util-linux ]

     

       50
       51
        
                    ++ optional enableUnfree zlib;

     

       51
       52
        
       

     

       52
       53
        
         installPhase = ''

+2 -2

pkgs/servers/sql/postgresql/default.nix

···

       35
       35
        
           setOutputFlags = false; # $out retains configureFlags :-/

     

       36
       36
        
       

     

       37
       37
        
           buildInputs =

     

       38
       38
       -
             [ zlib readline openssl libxml2 makeWrapper ]

     

       38
       38
       +
             [ zlib readline openssl libxml2 ]

     

       39
       39
        
             ++ lib.optionals icuEnabled [ icu ]

     

       40
       40
        
             ++ lib.optionals enableSystemd [ systemd ]

     

       41
       41
        
             ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];

     

       42
       42
        
       

     

       43
       43
       -
           nativeBuildInputs = lib.optionals icuEnabled [ pkg-config ];

     

       43
       43
       +
           nativeBuildInputs = [ makeWrapper ] ++ lib.optionals icuEnabled [ pkg-config ];

     

       44
       44
        
       

     

       45
       45
        
           enableParallelBuilding = !stdenv.isDarwin;

     

       46
       46

+1 -1

pkgs/servers/ums/default.nix

···

       17
       17
        
          };

     

       18
       18
        
         }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ makeWrapper ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
        
       

     

       22
       22
        
         installPhase = ''

     

       23
       23
        
           cp -a . $out/

+2 -2

pkgs/servers/xmpp/ejabberd/default.nix

···

       32
       32
        
           sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
       -
         nativeBuildInputs = [ fakegit ];

     

       35
       35
       +
         nativeBuildInputs = [ fakegit makeWrapper ];

     

       36
       36
        
       

     

       37
       37
       -
         buildInputs = [ erlang openssl expat libyaml gd makeWrapper ]

     

       37
       37
       +
         buildInputs = [ erlang openssl expat libyaml gd ]

     

       38
       38
        
           ++ lib.optional withSqlite sqlite

     

       39
       39
        
           ++ lib.optional withPam pam

     

       40
       40
        
           ++ lib.optional withZlib zlib

+2 -1

pkgs/servers/zookeeper/default.nix

···

       9
       9
        
           sha512 = "caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper jre ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ jre ];

     

       13
       14
        
       

     

       14
       15
        
         phases = ["unpackPhase" "installPhase"];

     

       15
       16

+1 -1

pkgs/tools/X11/run-scaled/default.nix

···

       11
       11
        
           sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           mkdir -p $out/bin

+2 -2

pkgs/tools/X11/xbindkeys-config/default.nix

···

       4
       4
        
         pname = "xbindkeys-config";

     

       5
       5
        
         version = "0.1.3";

     

       6
       6
        
       

     

       7
       7
       -
         nativeBuildInputs = [ pkg-config ];

     

       8
       8
       -
         buildInputs = [ gtk makeWrapper ];

     

       7
       7
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       8
       8
       +
         buildInputs = [ gtk ];

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz";

+2 -1

pkgs/tools/X11/xdg-user-dirs/default.nix

···

       8
       8
        
           sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ libxslt docbook_xsl makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ libxslt docbook_xsl ];

     

       12
       13
        
       

     

       13
       14
        
         preFixup = ''

     

       14
       15
        
           # fallback values need to be last

+2 -1

pkgs/tools/archivers/unp/default.nix

···

       10
       10
        
       in stdenv.mkDerivation {

     

       11
       11
        
         pname = "unp";

     

       12
       12
        
         version = "2.0-pre7";

     

       13
       13
       -
         buildInputs = [ perl makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ perl ];

     

       14
       15
        
       

     

       15
       16
        
         src = fetchurl {

     

       16
       17
        
           # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2";

+1 -1

pkgs/tools/backup/diskrsync/default.nix

···

       14
       14
        
         goPackagePath = "github.com/dop251/diskrsync";

     

       15
       15
        
         goDeps = ./deps.nix;

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ makeWrapper ];

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         preFixup = ''

     

       20
       20
        
           wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin

+1 -1

pkgs/tools/backup/duplicati/default.nix

···

       12
       12
        
           stripRoot = false;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         installPhase = ''

     

       18
       18
        
           mkdir -p $out/{bin,share/${pname}-${version}}

+2 -1

pkgs/tools/backup/duply/default.nix

···

       11
       11
        
           sha256 = "sha256-I1KkblFnZVOCvcWEarGsSXnzlod2+yZ4okaTpckLFbE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ txt2man makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
         buildInputs = [ txt2man ];

     

       15
       16
        
       

     

       16
       17
        
         postPatch = "patchShebangs .";

     

       17
       18

+2 -1

pkgs/tools/backup/store-backup/default.nix

···

       20
       20
        
       

     

       21
       21
        
         enableParallelBuilding = true;

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ perl makeWrapper ];

     

       23
       23
       +
         nativeBuildInputs = [ makeWrapper ];

     

       24
       24
       +
         buildInputs = [ perl ];

     

       24
       25
        
       

     

       25
       26
        
         src = fetchurl {

     

       26
       27
        
           url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2";

+2 -2

pkgs/tools/filesystems/fuse-7z-ng/default.nix

···

       11
       11
        
           sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkg-config ];

     

       15
       15
       -
         buildInputs = [ fuse autoconf automake makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ pkg-config makeWrapper ];

     

       15
       15
       +
         buildInputs = [ fuse autoconf automake ];

     

       16
       16
        
       

     

       17
       17
        
         preConfigure = "./autogen.sh";

     

       18
       18

+1 -1

pkgs/tools/filesystems/rmount/default.nix

···

       12
       12
        
           sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         installPhase = ''

     

       18
       18
        
           install -D ${src}/rmount.man  $out/share/man/man1/rmount.1

+2 -1

pkgs/tools/filesystems/xtreemfs/default.nix

···

       13
       13
        
         pname = "XtreemFS";

     

       14
       14
        
         version = "1.5.1.81";

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ which attr makeWrapper python ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
         buildInputs = [ which attr python ];

     

       17
       18
        
       

     

       18
       19
        
         patches = [

     

       19
       20
        
           (fetchpatch {

+1 -1

pkgs/tools/graphics/diagrams-builder/default.nix

···

       33
       33
        
       stdenv.mkDerivation {

     

       34
       34
        
         name = "diagrams-builder";

     

       35
       35
        
       

     

       36
       36
       -
         buildInputs = [ makeWrapper ];

     

       36
       36
       +
         nativeBuildInputs = [ makeWrapper ];

     

       37
       37
        
       

     

       38
       38
        
         buildCommand = with lib;

     

       39
       39
        
           concatStrings (intersperse "\n" (map exeWrapper backends));

+2 -1

pkgs/tools/graphics/fgallery/default.nix

···

       16
       16
        
           sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ unzip makeWrapper ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
       +
         buildInputs = [ unzip ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);

     

       20
       21
        
       

     

       21
       22
        
         installPhase = ''

     

       22
       23
        
           mkdir -p "$out/bin"

+2 -1

pkgs/tools/graphics/icoutils/default.nix

···

       8
       8
        
           sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ makeWrapper libpng perl ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ libpng perl ];

     

       12
       13
        
         propagatedBuildInputs = [ perlPackages.LWP ];

     

       13
       14
        
       

     

       14
       15
        
         patchPhase = ''

+2 -1

pkgs/tools/graphics/pdfread/default.nix

···

       13
       13
        
           sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ unzip python makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
         buildInputs = [ unzip python ];

     

       17
       18
        
       

     

       18
       19
        
         broken = true; # Not found.

     

       19
       20

+2 -2

pkgs/tools/graphics/structure-synth/default.nix

···

       10
       10
        
           sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ qt4 unzip libGLU makeWrapper ];

     

       14
       14
       -
         nativeBuildInputs = [ qmake4Hook ];

     

       13
       13
       +
         buildInputs = [ qt4 unzip libGLU ];

     

       14
       14
       +
         nativeBuildInputs = [ qmake4Hook makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15:

     

       17
       17
        
         patches = [ ./gcc47.patch ];

+2 -1

pkgs/tools/graphics/welkin/default.nix

···

       12
       12
        
       

     

       13
       13
        
         sourceRoot = "welkin-r9638/tags/${version}";

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ jre makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = [ jre ];

     

       16
       17
        
       

     

       17
       18
        
         installPhase = ''

     

       18
       19
        
           mkdir -p $out/{bin,share}

+1 -1

pkgs/tools/inputmethods/fcitx5/with-addons.nix

···

       5
       5
        
       

     

       6
       6
        
         paths = [ fcitx5 fcitx5-configtool fcitx5-lua fcitx5-qt fcitx5-gtk ] ++ addons;

     

       7
       7
        
       

     

       8
       8
       -
         buildInputs = [ makeWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ makeWrapper ];

     

       9
       9
        
       

     

       10
       10
        
         postBuild = ''

     

       11
       11
        
           wrapProgram $out/bin/fcitx5 \

+1 -1

pkgs/tools/misc/0x0/default.nix

···

       11
       11
        
           sha256 = "1qpylyxrisy3p2lyirfarfj5yzrdjgsgxwf8gqwljpcjn207hr72";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           install -Dm755 0x0 $out/bin/0x0

+2 -2

pkgs/tools/misc/arp-scan/default.nix

···

       18
       18
        
           URI

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ autoreconfHook ];

     

       22
       22
       -
         buildInputs = [ perlPackages.perl libpcap makeWrapper ];

     

       21
       21
       +
         nativeBuildInputs = [ autoreconfHook makeWrapper ];

     

       22
       22
       +
         buildInputs = [ perlPackages.perl libpcap ];

     

       23
       23
        
       

     

       24
       24
        
         postInstall = ''

     

       25
       25
        
           for name in get-{oui,iab}; do

+2 -1

pkgs/tools/misc/byobu/default.nix

···

       16
       16
        
       

     

       17
       17
        
         doCheck = true;

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ perl makeWrapper gettext ];

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
       +
         buildInputs = [ perl gettext ];

     

       20
       21
        
         propagatedBuildInputs = [ textual-window-manager screen ];

     

       21
       22
        
       

     

       22
       23
        
         postPatch = ''

+1 -1

pkgs/tools/misc/capture/default.nix

···

       11
       11
        
           sha256 = "0zyyg4mvrny7cc2xgvfip97b6yc75ka5ni39rwls93971jbk83d6";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           install -Dm755 src/capture.sh $out/bin/capture

+2 -3

pkgs/tools/misc/cloc/default.nix

···

       15
       15
        
           sourceRoot=$(echo */Unix)

     

       16
       16
        
         '';

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ makeWrapper ] ++ (with perlPackages; [

     

       19
       19
       -
           perl AlgorithmDiff ParallelForkManager RegexpCommon

     

       20
       20
       -
         ]);

     

       18
       18
       +
         nativeBuildInputs = [ makeWrapper ];

     

       19
       19
       +
         buildInputs = (with perlPackages; [ perl AlgorithmDiff ParallelForkManager RegexpCommon ]);

     

       21
       20
        
       

     

       22
       21
        
         makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ];

     

       23
       22

+2 -1

pkgs/tools/misc/debian-devscripts/default.nix

···

       16
       16
        
           sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ unzip xz dpkg libxslt python setuptools makeWrapper curl gnupg diffutils ] ++

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
       +
         buildInputs = [ unzip xz dpkg libxslt python setuptools curl gnupg diffutils ] ++

     

       20
       21
        
           (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);

     

       21
       22
        
       

     

       22
       23
        
         preConfigure = ''

+1 -1

pkgs/tools/misc/graylog/default.nix

···

       12
       12
        
         dontBuild = true;

     

       13
       13
        
         dontStrip = true;

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
         makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ];

     

       17
       17
        
       

     

       18
       18
        
         passthru.tests = { inherit (nixosTests) graylog; };

+1 -1

pkgs/tools/misc/ix/default.nix

···

       9
       9
        
           sha256 =  "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
         phases = [ "installPhase" "fixupPhase" ];

     

       15
       15

+2 -1

pkgs/tools/misc/keychain/default.nix

···

       12
       12
        
           sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper perl ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = [ perl ];

     

       16
       17
        
       

     

       17
       18
        
         installPhase = ''

     

       18
       19
        
           mkdir -p $out/{bin,share/man/man1}

+2 -1

pkgs/tools/misc/lbdb/default.nix

···

       19
       19
        
           sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ]

     

       22
       22
       +
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       +
         buildInputs = [ goobook perl ConvertASN1 perlldap AuthenSASL ]

     

       23
       24
        
           ++ optional (!stdenv.isDarwin) finger_bsd

     

       24
       25
        
           ++ optional   (abook != null) abook

     

       25
       26
        
           ++ optional   (gnupg != null) gnupg

+2 -1

pkgs/tools/misc/moreutils/default.nix

···

       15
       15
        
           substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook

     

       16
       16
        
         '';

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ]

     

       18
       18
       +
         nativeBuildInputs = [ makeWrapper ];

     

       19
       19
       +
         buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ]

     

       19
       20
        
           ++ optional stdenv.isDarwin darwin.cctools;

     

       20
       21
        
       

     

       21
       22
        
         propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ];

+1 -1

pkgs/tools/misc/ocz-ssd-guru/default.nix

···

       12
       12
        
           sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         libPath = lib.makeLibraryPath [

     

       18
       18
        
             xorg.libX11

+2 -1

pkgs/tools/misc/opentsdb/default.nix

···

       13
       13
        
           sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
         buildInputs = [ autoconf automake curl jdk nettools python git ];

     

       17
       18
        
       

     

       18
       19
        
         preConfigure = ''

     

       19
       20
        
           patchShebangs ./build-aux/

+1 -1

pkgs/tools/misc/os-prober/default.nix

···

       21
       21
        
           sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ makeWrapper ];

     

       24
       24
       +
         nativeBuildInputs = [ makeWrapper ];

     

       25
       25
        
         installPhase = ''

     

       26
       26
        
           # executables

     

       27
       27
        
           install -Dt $out/bin os-prober linux-boot-prober

+1 -1

pkgs/tools/misc/pb_cli/default.nix

···

       16
       16
        
           sha256 = "0w6a789zffvz4ixsb92q45n5s4xyx7s2l2f07972i3dajaaai8z7";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ makeWrapper ];

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
        
       

     

       21
       21
        
         liveDeps = [ jq curl ] ++ lib.optional screenshots maim

     

       22
       22
        
                                ++ lib.optional video capture

+2 -1

pkgs/tools/misc/pk2cmd/default.nix

···

       16
       16
        
           wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2

     

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ libusb-compat-0_1 makeWrapper ];

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
       +
         buildInputs = [ libusb-compat-0_1 ];

     

       20
       21
        
       

     

       21
       22
        
         meta = {

     

       22
       23
        
           homepage = "https://www.microchip.com/pickit2";

+1 -1

pkgs/tools/misc/plowshare/default.nix

···

       12
       12
        
           sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         phases = [ "unpackPhase" "installPhase" "fixupPhase" ];

     

       18
       18

+2 -1

pkgs/tools/misc/ponysay/default.nix

···

       8
       8
        
           sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ python3 texinfo makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ python3 texinfo  ];

     

       12
       13
        
       

     

       13
       14
        
         inherit python3;

     

       14
       15

+1 -1

pkgs/tools/misc/profile-cleaner/default.nix

···

       11
       11
        
           sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           PREFIX=\"\" DESTDIR=$out make install

+1 -1

pkgs/tools/misc/pws/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "pws-${(import ./gemset.nix).pws.version}";

     

       5
       5
        
       

     

       6
       6
       -
         buildInputs = [ makeWrapper ];

     

       6
       6
       +
         nativeBuildInputs = [ makeWrapper ];

     

       7
       7
        
       

     

       8
       8
        
         phases = ["installPhase"];

     

       9
       9

+2 -2

pkgs/tools/misc/svtplay-dl/default.nix

···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         pythonPaths = [ pycrypto pyyaml requests ];

     

       21
       21
       -
         buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ pythonPaths;

     

       22
       22
       -
         nativeBuildInputs = [ gitMinimal zip ];

     

       21
       21
       +
         buildInputs = [ python perl nose mock python-dateutil setuptools ] ++ pythonPaths;

     

       22
       22
       +
         nativeBuildInputs = [ gitMinimal zip makeWrapper ];

     

       23
       23
        
       

     

       24
       24
        
         postPatch = ''

     

       25
       25
        
           substituteInPlace scripts/run-tests.sh \

+1 -1

pkgs/tools/misc/tmux-cssh/default.nix

···

       10
       10
        
           sha256 = "473e27f3b69864b905d1340d97917cd202705c761611eb3aec4c24521f69b52c";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
       

     

       15
       15
        
         installPhase = ''

     

       16
       16
        
           mkdir -p $out/bin

+1 -1

pkgs/tools/misc/xvfb-run/default.nix

···

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation {

     

       12
       12
        
         name = "xvfb-run";

     

       13
       13
       -
         buildInputs = [makeWrapper];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
         buildCommand = ''

     

       15
       15
        
           mkdir -p $out/bin

     

       16
       16
        
           cp ${xvfb_run} $out/bin/xvfb-run

+2 -1

pkgs/tools/networking/airfield/default.nix

···

       42
       42
        
       in stdenv.mkDerivation {

     

       43
       43
        
         inherit name version src;

     

       44
       44
        
       

     

       45
       45
       -
         buildInputs = [ makeWrapper nodejs ];

     

       45
       45
       +
         nativeBuildInputs = [ makeWrapper ];

     

       46
       46
       +
         buildInputs = [ nodejs ];

     

       46
       47
        
       

     

       47
       48
        
         dontBuild = true;

     

       48
       49

+2 -1

pkgs/tools/networking/atftp/default.nix

···

       9
       9
        
           sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ readline tcp_wrappers pcre gcc ];

     

       13
       14
        
       

     

       14
       15
        
         # Expects pre-GCC5 inline semantics

     

       15
       16
        
         NIX_CFLAGS_COMPILE = "-std=gnu89";

+1 -1

pkgs/tools/networking/carddav-util/default.nix

···

       10
       10
        
           sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [makeWrapper];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ];

     

       16
       16

+2 -2

pkgs/tools/networking/dhcp/default.nix

···

       20
       20
        
             ./set-hostname.patch

     

       21
       21
        
           ];

     

       22
       22
        
       

     

       23
       23
       -
         nativeBuildInputs = [ perl ];

     

       23
       23
       +
         nativeBuildInputs = [ perl makeWrapper ];

     

       24
       24
        
       

     

       25
       25
       -
         buildInputs = [ makeWrapper openldap ];

     

       25
       25
       +
         buildInputs = [ openldap ];

     

       26
       26
        
       

     

       27
       27
        
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       28
       28

+2 -2

pkgs/tools/networking/mosh/default.nix

···

       11
       11
        
           sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       15
       15
       -
         buildInputs = [ protobuf ncurses zlib makeWrapper openssl bash-completion ]

     

       14
       14
       +
         nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];

     

       15
       15
       +
         buildInputs = [ protobuf ncurses zlib openssl bash-completion ]

     

       16
       16
        
           ++ (with perlPackages; [ perl IOTty ])

     

       17
       17
        
           ++ lib.optional withUtempter libutempter;

     

       18
       18

+1 -1

pkgs/tools/networking/openresolv/default.nix

···

       9
       9
        
           sha256 = "sha256-QrMFCOhXoihTXGMeqsk2hi2G7KaMFLXAvzh7oXa5G5c=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
       

     

       14
       14
        
         configurePhase =

     

       15
       15
        
           ''

+2 -1

pkgs/tools/networking/openvpn/openvpn_learnaddress.nix

···

       9
       9
        
           sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper coreutils gawk util-linux ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ coreutils gawk util-linux ];

     

       13
       14
        
       

     

       14
       15
        
         installPhase = ''

     

       15
       16
        
           install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress

+1 -1

pkgs/tools/networking/snabb/default.nix

···

       15
       15
        
           sha256 = "1sas9d9kk92mc2wrwgmm0xxz7ycmh388dwvyxf1hy183yvin1nac";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ makeWrapper ];

     

       18
       18
       +
         nativeBuildInputs = [ makeWrapper ];

     

       19
       19
        
       

     

       20
       20
        
         NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];

     

       21
       21

+2 -1

pkgs/tools/networking/swaks/default.nix

···

       9
       9
        
           sha256 = "0c2sx4nrh4whsqzj6m5ay8d7yqan3aqgg436p8jb25bs91ykn2pv";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ perl makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ perl ];

     

       13
       14
        
       

     

       14
       15
        
         installPhase = ''

     

       15
       16
        
           mkdir -p $out/bin

+2 -1

pkgs/tools/networking/swec/default.nix

···

       8
       8
        
           sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ makeWrapper perlPackages.perl perlPackages.LWP perlPackages.URI perlPackages.HTMLParser ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ perlPackages.perl perlPackages.LWP perlPackages.URI perlPackages.HTMLParser ];

     

       12
       13
        
         checkInputs = [ perlPackages.HTTPServerSimple perlPackages.Parent ];

     

       13
       14
        
       

     

       14
       15
        
         configurePhase = ''

+1 -1

pkgs/tools/networking/telepresence/default.nix

···

       31
       31
        
           sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
       -
         buildInputs = [ makeWrapper ];

     

       34
       34
       +
         nativeBuildInputs = [ makeWrapper ];

     

       35
       35
        
       

     

       36
       36
        
         postInstall = ''

     

       37
       37
        
           wrapProgram $out/bin/telepresence \

+2 -1

pkgs/tools/networking/vpnc/default.nix

···

       19
       19
        
         # `ifconfig' as found in net-tools (not GNU Inetutils).

     

       20
       20
        
         propagatedBuildInputs = [ nettools ];

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [libgcrypt perl makeWrapper openssl ];

     

       22
       22
       +
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       +
         buildInputs = [libgcrypt perl openssl ];

     

       23
       24
        
       

     

       24
       25
        
         preConfigure = ''

     

       25
       26
        
           sed -i 's|^#OPENSSL|OPENSSL|g' Makefile

+3 -1

pkgs/tools/package-management/nix-bundle/default.nix

···

       11
       11
        
           sha256 = "0hdvdjm467w37clkhbifn54hbdmnxlbk66cj88lwaz26j4s2ik5g";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
       +
       

     

       14
       16
        
         # coreutils, gnutar is actually needed by nix for bootstrap

     

       15
       15
       -
         buildInputs = [ nix coreutils makeWrapper gnutar gzip bzip2 ];

     

       17
       17
       +
         buildInputs = [ nix coreutils gnutar gzip bzip2 ];

     

       16
       18
        
       

     

       17
       19
        
         binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ];

     

       18
       20

+2 -1

pkgs/tools/package-management/nix-pin/default.nix

···

       9
       9
        
           rev = "version-${version}";

     

       10
       10
        
           sha256 = "1pccvc0iqapms7kidrh09g5fdx44x622r5l9k7bkmssp3v4c68vy";

     

       11
       11
        
         };

     

       12
       12
       -
         buildInputs = [ python3 mypy makeWrapper ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ python3 mypy ];

     

       13
       14
        
         checkPhase = ''

     

       14
       15
        
           mypy bin/*

     

       15
       16
        
         '';

+2 -2

pkgs/tools/security/ecryptfs/default.nix

···

       35
       35
        
       

     

       36
       36
        
         configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ];

     

       37
       37
        
       

     

       38
       38
       -
         nativeBuildInputs = [ pkg-config ]

     

       38
       38
       +
         nativeBuildInputs = [ pkg-config makeWrapper ]

     

       39
       39
        
         # if python2 support is requested, it is needed at builtime as well as runtime.

     

       40
       40
        
         ++ lib.optionals (enablePython) [ python2 ]

     

       41
       41
        
         ;

     

       42
       42
       -
         buildInputs = [ perl nss nspr pam intltool makeWrapper ]

     

       42
       42
       +
         buildInputs = [ perl nss nspr pam intltool ]

     

       43
       43
        
         ++ lib.optionals (enablePython) [ python2 ]

     

       44
       44
        
         ;

     

       45
       45
        
         propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ];

+1 -1

pkgs/tools/security/ecryptfs/helper.nix

···

       15
       15
        
       

     

       16
       16
        
         phases = [ "installPhase" ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ makeWrapper ];

     

       18
       18
       +
         nativeBuildInputs = [ makeWrapper ];

     

       19
       19
        
       

     

       20
       20
        
         # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin

     

       21
       21
        
         installPhase = ''

+2 -1

pkgs/tools/security/enpass/default.nix

···

       59
       59
        
             maintainers = with maintainers; [ ewok ];

     

       60
       60
        
           };

     

       61
       61
        
       

     

       62
       62
       -
           buildInputs = [makeWrapper dpkg];

     

       62
       62
       +
           nativeBuildInputs = [ makeWrapper ];

     

       63
       63
       +
           buildInputs = [dpkg];

     

       63
       64
        
           phases = [ "unpackPhase" "installPhase" ];

     

       64
       65
        
       

     

       65
       66
        
           unpackPhase = "dpkg -X $src .";

+1 -1

pkgs/tools/security/gen-oath-safe/default.nix

···

       10
       10
        
           sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
       

     

       15
       15
        
         dontBuild = true;

     

       16
       16

+2 -1

pkgs/tools/security/ipscan/default.nix

···

       12
       12
        
         sourceRoot = ".";

     

       13
       13
        
         unpackCmd = "${dpkg}/bin/dpkg-deb -x $src .";

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper jdk ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = [ jdk ];

     

       16
       17
        
       

     

       17
       18
        
         installPhase = ''

     

       18
       19
        
           mkdir -p $out/share

+2 -1

pkgs/tools/security/kpcli/default.nix

···

       9
       9
        
           sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper perl ];

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
         buildInputs = [ perl ];

     

       13
       14
        
       

     

       14
       15
        
         phases = [ "installPhase" "fixupPhase" ];

     

       15
       16

+1 -1

pkgs/tools/security/metasploit/default.nix

···

       17
       17
        
           sha256 = "sha256-DD/nFbSNs3nVNe+W+5zAmDlvMCseYuWWpKX9Dp+9Etc=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ makeWrapper ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
        
       

     

       22
       22
        
         dontPatchELF = true; # stay away from exploit executables

     

       23
       23

+1 -1

pkgs/tools/security/open-ecard/default.nix

···

       25
       25
        
       

     

       26
       26
        
         phases = "installPhase";

     

       27
       27
        
       

     

       28
       28
       -
         buildInputs = [ makeWrapper ];

     

       28
       28
       +
         nativeBuildInputs = [ makeWrapper ];

     

       29
       29
        
       

     

       30
       30
        
         desktopItem = makeDesktopItem {

     

       31
       31
        
           name = appName;

+1 -1

pkgs/tools/security/pass/rofi-pass.nix

···

       13
       13
        
           sha256 = "131jpcwyyzgzjn9lx4k1zn95pd68pjw4i41jfzcp9z9fnazyln5n";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ makeWrapper ];

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
        
       

     

       18
       18
        
         dontBuild = true;

     

       19
       19

+1 -1

pkgs/tools/system/bpytop/default.nix

···

       11
       11
        
           sha256 = "sha256-ds+N0z7Vfw7xv+nE8RIfFjel81mJgIo1u1KspOHLxKc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
         propagatedBuildInputs = with python3Packages; [ python psutil ];

     

       16
       16
        
       

     

       17
       17
        
         dontBuild = true;

+2 -1

pkgs/tools/system/inxi/default.nix

···

       31
       31
        
           sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
       -
         buildInputs = [ perl makeWrapper ];

     

       34
       34
       +
         nativeBuildInputs = [ makeWrapper ];

     

       35
       35
       +
         buildInputs = [ perl ];

     

       35
       36
        
       

     

       36
       37
        
         installPhase = ''

     

       37
       38
        
           mkdir -p $out/bin

+1 -1

pkgs/tools/system/rofi-systemd/default.nix

···

       12
       12
        
           sha256 = "0lgffb6rk1kf91j4j303lzpx8w2g9zy2gk99p8g8pk62a30c5asm";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
        
       

     

       17
       17
        
         dontBuild = true;

     

       18
       18

+1 -1

pkgs/tools/text/jsawk/default.nix

···

       10
       10
        
           sha256 = "0z3vdr3c8nvdrrxkjv9b4xg47mdb2hsknxpimw6shgwbigihapyr";

     

       11
       11
        
         };

     

       12
       12
        
         dontBuild = true;

     

       13
       13
       -
         buildInputs = [ makeWrapper ];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
         installPhase = ''

     

       15
       15
        
           mkdir -p $out/bin

     

       16
       16
        
           cp $src/jsawk $out/bin/

+2 -1

pkgs/tools/text/popfile/default.nix

···

       12
       12
        
           stripRoot = false;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ] ++ (with perlPackages; [

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
         buildInputs = (with perlPackages; [

     

       16
       17
        
           ## These are all taken from the popfile documentation as applicable to Linux

     

       17
       18
        
           ## http://getpopfile.org/docs/howtos:allplatformsrequireperl

     

       18
       19
        
           perl

+1 -1

pkgs/tools/text/reckon/default.nix

···

       6
       6
        
       

     

       7
       7
        
         phases = [ "installPhase" ];

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ makeWrapper ];

     

       9
       9
       +
         nativeBuildInputs = [ makeWrapper ];

     

       10
       10
        
       

     

       11
       11
        
         installPhase = let

     

       12
       12
        
           env = bundlerEnv {

+1 -1

pkgs/tools/text/unoconv/default.nix

···

       17
       17
        
           sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ asciidoc makeWrapper ];

     

       20
       20
       +
         nativeBuildInputs = [ asciidoc makeWrapper ];

     

       21
       21
        
       

     

       22
       22
        
         preBuild = ''

     

       23
       23
        
           makeFlags=prefix="$out"

+2 -1

pkgs/tools/typesetting/docbook2odf/default.nix

···

       8
       8
        
           sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ perlPackages.perl makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ perlPackages.perl ];

     

       12
       13
        
       

     

       13
       14
        
         installPhase = ''

     

       14
       15
        
           mkdir -p "$out/bin/"

+2 -1

pkgs/tools/typesetting/docbook2x/default.nix

···

       15
       15
        
         # writes its output to stdout instead of creating a file.

     

       16
       16
        
         patches = [ ./db2x_texixml-to-stdout.patch ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ texinfo groff libxml2 libxslt makeWrapper opensp libiconv ]

     

       18
       18
       +
         nativeBuildInputs = [ makeWrapper ];

     

       19
       19
       +
         buildInputs = [ texinfo groff libxml2 libxslt opensp libiconv ]

     

       19
       20
        
           ++ (with perlPackages; [ perl XMLSAX XMLParser XMLNamespaceSupport ]);

     

       20
       21
        
       

     

       21
       22
        
         postConfigure = ''

+2 -1

pkgs/tools/typesetting/pdfsandwich/default.nix

···

       10
       10
        
           sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ ocaml perl makeWrapper];

     

       13
       13
       +
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
       +
         buildInputs = [ ocaml perl ];

     

       14
       15
        
         installPhase = ''

     

       15
       16
        
           mkdir -p $out/bin

     

       16
       17
        
           cp -p pdfsandwich $out/bin

+1 -1

pkgs/tools/typesetting/sshlatex/default.nix

···

       11
       11
        
           sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = let

     

       17
       17
        
           binPath = lib.makeBinPath [ openssh perl gnutar bash inotify-tools ];

+2 -1

pkgs/tools/typesetting/ted/default.nix

···

       58
       58
        
           runHook postInstall

     

       59
       59
        
         '';

     

       60
       60
        
       

     

       61
       61
       -
         buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ];

     

       61
       61
       +
         nativeBuildInputs = [ makeWrapper ];

     

       62
       62
       +
         buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];

     

       62
       63
        
       

     

       63
       64
        
         meta = with lib; {

     

       64
       65
        
           description = "An easy rich text processor";

+2 -2

pkgs/tools/typesetting/tex/texlive/bin.nix

···

       270
       270
        
       

     

       271
       271
        
         inherit (common) src;

     

       272
       272
        
       

     

       273
       273
       -
         nativeBuildInputs = [ perl pkg-config ];

     

       274
       274
       -
         buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ];

     

       273
       273
       +
         nativeBuildInputs = [ perl pkg-config makeWrapper ];

     

       274
       274
       +
         buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript ];

     

       275
       275
        
       

     

       276
       276
        
         preConfigure = ''

     

       277
       277
        
           cd texk/dvipng

+2 -1

pkgs/tools/virtualization/ec2-ami-tools/default.nix

···

       5
       5
        
       

     

       6
       6
        
         version = "1.5.7";

     

       7
       7
        
       

     

       8
       8
       -
         buildInputs = [ unzip makeWrapper ];

     

       8
       8
       +
         nativeBuildInputs = [ makeWrapper ];

     

       9
       9
       +
         buildInputs = [ unzip ];

     

       9
       10
        
       

     

       10
       11
        
         src = fetchurl {

     

       11
       12
        
           url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip";

+2 -1

pkgs/tools/virtualization/ec2-api-tools/default.nix

···

       8
       8
        
           sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ unzip makeWrapper ];

     

       11
       11
       +
         nativeBuildInputs = [ makeWrapper ];

     

       12
       12
       +
         buildInputs = [ unzip ];

     

       12
       13
        
       

     

       13
       14
        
         installPhase =

     

       14
       15
        
           ''