diff options
Diffstat (limited to 'pkgs/applications')
36 files changed, 62 insertions, 59 deletions
diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index b155c1c41b6..675f31b478c 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"; }; - buildInputs = [ unzip portaudio ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ portaudio ]; patches = [ ./gcc6.patch diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index aa0dc90adf5..0b9fa3dfbe5 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ unzip portaudio wxGTK ]; + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ portaudio wxGTK ]; # TODO: # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index fb774476a2e..bf0a347d14b 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w"; }; - buildInputs = [ unzip mpg123 ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ mpg123 ]; sourceRoot = "."; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 9b50b40a5bb..feaf9ed70cf 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; }; - buildInputs = [ unzip puredata ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ puredata ]; unpackPhase = '' unzip $src diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 1eb6eb38931..811b8c2ee9a 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7"; }; - buildInputs = [ unzip puredata ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ puredata ]; unpackPhase = '' unzip $src diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index e5e67ec44dd..7fd2adefce0 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b"; }; - buildInputs = [ unzip puredata fftw ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ puredata fftw ]; unpackPhase = '' mkdir source diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index abc31d9f180..ce775abeb42 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = "unzip $src"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 1c3c4aade5f..9a099d9eee1 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -65,9 +65,9 @@ let sha256 = sha256Hash; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ makeWrapper - unzip ]; installPhase = '' cp -r . $out diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index 25e620c51e4..94bb1a0d286 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - unzip pkg-config ncurses libX11 diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index 3814c8a879f..4f78267dbe5 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "fte-0.50.02"; - buildInputs = [ unzip perl libX11 libXpm gpm ncurses slang ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ perl libX11 libXpm gpm ncurses slang ]; ftesrc = fetchurl { url = "mirror://sourceforge/fte/fte-20110708-src.zip"; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index e5fde3e501e..12b66370d50 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ autoconf automake shared-mime-info intltool - mono gtk-sharp-2_0 gnome-sharp unzip + mono gtk-sharp-2_0 gnome-sharp dotnetPackages.NUnit dotnetPackages.NUnitRunners dotnetPackages.Nuget diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index f968b85c6ff..c0345dbf8ec 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -56,8 +56,8 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl python unzip libicns imagemagick ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ perl python libicns imagemagick ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix index 9d86bdc4c5b..fe22f3424f2 100644 --- a/pkgs/applications/editors/textadept/10/default.nix +++ b/pkgs/applications/editors/textadept/10/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { version = "10.8"; pname = "textadept"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - gtk2 ncurses glib unzip zip + gtk2 ncurses glib zip ]; src = fetchhg { diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix index a0037ca6c2b..ec310639c36 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { version = "11.0_beta"; pname = "textadept11"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - gtk2 ncurses glib unzip zip + gtk2 ncurses glib zip ]; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 470683bad43..39ed4e8032e 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -60,14 +60,12 @@ in ''; }; - buildInputs = (if stdenv.isDarwin - then [ unzip ] - else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) - ++ [ libsecret libXScrnSaver ]; + buildInputs = [ libsecret libXScrnSaver ] + ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages); runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; - nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; + nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; dontBuild = true; dontConfigure = true; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 902fb43047b..2df7bc625e8 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { comment = "The bridge between designers and developers"; }; - nativeBuildInputs = [makeWrapper wrapGAppsHook]; - buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 312316b3397..65d3c9735df 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -15,8 +15,7 @@ let url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; inherit jre; # JAR files that are intended to be used by other packages diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index c47c41a1cdc..b5fc70494fc 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip"; sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23"; }; - buildInputs = [jre unzip]; + nativeBuildInputs = [ unzip ]; + buildInputs = [jre]; buildPhase = ""; installPhase = '' mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm} diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 29469d9fff9..14b372d91e5 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = [ "buildPhase" ]; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index d27a10af20c..8ee8337bea2 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; dontStrip = true; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}"; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 6388d005fe5..843193bba18 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -12,8 +12,8 @@ with builtins; buildDotnetPackage rec { sourceRoot = "."; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip icoutils ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ icoutils ]; patches = [ (substituteAll { diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 2bb3d14e1d2..0a46393bd22 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation { sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index b3e93ce5127..d6b20a7f01e 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation { cd $out; unzip $src ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' dir=$(echo $out/OpenJUMP-*) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 8207040f1b8..bf551c59a7a 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -43,14 +43,14 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook + desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook unzip ]; buildInputs = [ alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype gnome2.GConf gtk2 hunspell libevent libjpeg libnotify libstartup_notification libGLU libGL - libpulseaudio unzip yasm zip zlib + libpulseaudio yasm zip zlib ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 3b3a0a85890..81c95418e69 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' unzip $src diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index d9e997f514b..327fc5f31e2 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -41,12 +41,12 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gnum4 makeWrapper perl pkg-config python2 + gnum4 makeWrapper perl pkg-config python2 unzip ]; buildInputs = [ alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 - unzip gnome2.GConf xorg.libXt + gnome2.GConf xorg.libXt ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 087dd502946..dfc2613d3e9 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0"; }; - buildInputs = [ python unzip wxPython wrapPython ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ python wxPython wrapPython ]; pythonPath = [ wxPython ]; preConfigure = "cd torchat/src; rm portable.txt"; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 809e4528df9..ceccf44819f 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - unzip fpc lazarus stdenv.cc + fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl ]; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 35aebf23260..0815dfc8982 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ unzip jdk ib-tws ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ jdk ib-tws ]; installPhase = '' mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index b48e13ecf00..4c32516b29f 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip jre ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ jre ]; sourceRoot = "snpEff"; diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 242f2e2cea5..d53236d8070 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "perseus-4-beta"; version = "4-beta"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 05b95140b1b..9d18763aa32 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; # The -Xmx1000M comes suggested from their download page: # http://www.cs.waikato.ac.nz/ml/weka/downloading.html diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 9a304272fe9..2fafa2ebf87 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1"; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook unzip ]; - buildInputs = [ unzip gsettings-desktop-schemas gtk3 ]; + buildInputs = [ gsettings-desktop-schemas gtk3 ]; installPhase = '' mkdir -p $out/bin \ diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index f499be17f7c..d2511e27863 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -21,8 +21,8 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ docutils unzip ] + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ docutils ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ hg-git dulwich ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 7c0a96583e7..26d263b060d 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -19,8 +19,8 @@ in python3Packages.buildPythonApplication rec { passthru = { inherit python; }; # pass it so that the same version can be used in hg2git - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ docutils unzip ] + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ docutils ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index b78b7c01570..0acad8edbe5 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { EOF ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ unzip libixp_hg txt2tags dash python which + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ libixp_hg txt2tags dash python which libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help |