diff options
Diffstat (limited to 'pkgs/applications')
191 files changed, 396 insertions, 481 deletions
diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index f781aad905d07..2a2e15d9849a7 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; longDescription = '' - Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. - Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. - ALSA, on the other hand, only provides routing facilities for MIDI clients. + Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. + Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. + ALSA, on the other hand, only provides routing facilities for MIDI clients. You can also run aj-snapshot in daemon mode if you want to have your connections continually restored. ''; diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 8cf9bec2e3df6..75494c0d37a6c 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: +{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkg-config }: stdenv.mkDerivation rec { pname = "artyFX"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ cairomm libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; meta = with stdenv.lib; { homepage = "http://openavproductions.com/artyfx/"; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 85806ca9a0d23..bbdcbc21b7893 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -75,8 +75,6 @@ in mkDerivation { nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index d9d1a11ce1db8..042d5b4b13a3e 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -79,8 +79,6 @@ let "-DSPOTIFY_BLOB=OFF" ]; - enableParallelBuilding = true; - passthru.unfree = unfree; postInstall = '' @@ -122,7 +120,7 @@ let ln -s "${free}/share/$dir" "$out/share/$dir" done ''; - enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://www.clementine-player.org"; description = "Spotify integration for Clementine"; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index d91e550334b65..e7d264675e216 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { # version and remove fluidsynth 1.x from nixpkgs again. version = "6.15.0"; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index c614b96f6385c..6c627c835ae58 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig +{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config , xorg }: stdenv.mkDerivation rec { pname = "eq10q"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix index c86e7b5e9ba19..5ae3292379ea4 100644 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ b/pkgs/applications/audio/eteroj.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuv, lv2 }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, libuv, lv2 }: stdenv.mkDerivation rec { pname = "eteroj.lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libuv lv2 ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 7cc431583edd0..fa93ca065deb1 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 08263f2abddc2..18915329ca9f1 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mv jack_oscrolloscope $out/bin/ ''; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "A simple waveform viewer for JACK"; homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 2a75b384af5ca..d049cf81b11d0 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 ]; - meta = { + meta = { description = "Console jack loudness meter"; homepage = "https://www.aelius.com/njh/jackmeter/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index c0900c56d0bd8..84894aeee5c4f 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, cmake, python3, ffmpeg_3, phonon, automoc4 +, pkg-config, cmake, python3, ffmpeg_3, phonon, automoc4 , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt , id3lib, taglib, mp4v2, flac, libogg, libvorbis , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols @@ -15,12 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; - buildInputs = [ - pkgconfig cmake python3 ffmpeg_3 phonon automoc4 - chromaprint docbook_xml_dtd_45 docbook_xsl libxslt - id3lib taglib mp4v2 flac libogg libvorbis zlib readline - qtbase qttools qtmultimedia qtquickcontrols ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ python3 ffmpeg_3 phonon automoc4 chromaprint + docbook_xml_dtd_45 docbook_xsl libxslt id3lib taglib mp4v2 flac + libogg libvorbis zlib readline qtbase qttools qtmultimedia + qtquickcontrols ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; @@ -29,8 +28,6 @@ stdenv.mkDerivation rec { export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/" ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A simple and powerful audio tag editor"; longDescription = '' diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index b01c4055e4061..8513c1aae7887 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -37,7 +37,6 @@ mkDerivation rec { ]; cmakeFlags = [ "-DWANT_QT5=ON" ]; - enableParallelBuilding = true; meta = with stdenv.lib; { description = "DAW similar to FL Studio (music production software)"; diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index 89a0da5e0d636..a25f3bad5b528 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses libpulseaudio ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; configurePhase = '' make PREFIX=$out build/Makefile diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 322eba2b9521a..ea7b8074de231 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 -, pkgconfig, openssl }: +, pkg-config, openssl }: stdenv.mkDerivation rec { pname = "petri-foo"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; - buildInputs = - [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs - libsamplerate libsndfile libtool libxml2 pkgconfig openssl - ]; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ alsaLib gtk2 libjack2 libgnomecanvas libpthreadstubs + libsamplerate libsndfile libtool libxml2 openssl ]; meta = with stdenv.lib; { description = "MIDI controllable audio sampler"; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index e6f41711fdf6a..2863ae3a61cbd 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -51,8 +51,6 @@ mkDerivation rec { libsamplerate ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Qt-based audio player that looks like Winamp"; homepage = "http://qmmp.ylsoftware.com/"; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 014906594a7d5..8b61bc07a6942 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - checkInputs = [ gtest ]; doCheck = !stdenv.isAarch64; # single failure that I can't explain diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 8bda179df1498..416f4906d6e2e 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation (rec { alsaLib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://www.rosegardenmusic.com/"; description = "Music composition and editing environment"; diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index ad5f8fda1a99d..b20188bfb4777 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: +{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }: stdenv.mkDerivation rec { pname = "sorcer"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost cairomm libsndfile lv2 ntk python ]; postPatch = '' # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://openavproductions.com/sorcer/"; description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 992dd728e7656..e8704ff61919e 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { stripLen = 1; }) ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 63ba44bec35aa..94bce19b7e1a0 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -18,7 +18,6 @@ mkDerivation { cmakeFlags = [ "-DWANT_PORTAUDIO=1" "-DWANT_PULSEAUDIO=1" "-DWANT_MP3_ENCODE=1" "-DWANT_LV2=0" ]; - enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 8f86d6e7ba93d..72c17aed52edf 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: stdenv.mkDerivation rec { pname = "ympd"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake mpd_clientlib openssl ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ mpd_clientlib openssl ]; meta = { homepage = "https://www.ympd.org"; diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 81825d3d5b02f..d2b69a32ab5a8 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -32,8 +32,6 @@ mkDerivation rec { find ./. -type f -iname "*.sh" -exec chmod +x {} \; ''; - enableParallelBuilding = true; - meta = { description = "Peer-to-peer electronic cash system (Cash client)"; longDescription= '' diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index 7205e882c3145..c108304ee3783 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -19,7 +19,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - + pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; version = "0.15.2"; diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix index 8aa693d287147..373170fe8ffd5 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - enableParallelBuilding = true; - meta = with lib; { description = "Secure, private blockchain with smart contracts based on Monero"; homepage = "https://dero.io/"; diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix index dfa005abb6ec2..25301a87aeaaa 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - enableParallelBuilding = true; - meta = with lib; { description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; homepage = "https://www.getmasari.org/"; diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 6d6f881ae65f7..eb4651e586e29 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -4,7 +4,7 @@ , util-linux, qtbase ? null, qttools ? null , enableUpnp ? false , disableWallet ? false -, disableDaemon ? false +, disableDaemon ? false , withGui ? false }: with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ optionals withGui [ "--with-gui=yes" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - + enableParallelBuilding = true; doChecks = true; postBuild = '' diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix index beb294d2dfe0a..ee817b5819537 100644 --- a/pkgs/applications/blockchains/sumokoin.nix +++ b/pkgs/applications/blockchains/sumokoin.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { "-DLMDB_INCLUDE=${lmdb}/include" ]; - enableParallelBuilding = true; - meta = with lib; { description = "A fork of Monero and a truely fungible cryptocurrency"; homepage = "https://www.sumokoin.org/"; diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index f16dd62bb1a44..d36c541893265 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, linux-pam }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ly"; version = "0.2.1"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { rev = version; sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d"; fetchSubmodules = true; - }; + }; buildInputs = [ linux-pam ]; makeFlags = [ "FLAGS=-Wno-error" ]; installPhase = '' mkdir -p $out/bin - cp bin/ly $out/bin + cp bin/ly $out/bin ''; meta = with lib; { diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 4ba8932fec259..b44dc7c6d4f64 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -96,8 +96,6 @@ stdenv.mkDerivation rec { rm -rf "$out"/include "$out"/lib ''; - enableParallelBuilding = true; - passthru = { inherit skia; }; meta = with lib; { diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index a12ccd257f8a1..4d02b6837ca18 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg"; }; - buildInputs = [ cmake makeWrapper alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; postFixup = '' wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib" diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index 0a635b7ba82e9..c4f43e71fe630 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - + installPhase = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index e7bd38f67b0de..a47688eca7e46 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -578,7 +578,8 @@ let }; vterm = super.vterm.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; + nativeBuildInputs = [ pkgs.cmake ]; + buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" "-DUSE_SYSTEM_LIBVTERM=ON" diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index e4b739af05178..61749a89fde44 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation { name = "session-management-for-emacs-2.2a"; - + src = fetchurl { url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; }; buildInputs = [emacs]; - + installPhase = '' mkdir -p "$out/share/emacs/site-lisp" cp lisp/*.el "$out/share/emacs/site-lisp/" ''; - meta = { + meta = { /* installation: add to your ~/.emacs (require 'session) (add-hook 'after-init-hook 'session-initialize) diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/applications/editors/jed/default.nix new file mode 100644 index 0000000000000..e3be0139abf41 --- /dev/null +++ b/pkgs/applications/editors/jed/default.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchzip +, pkg-config +, gpm +, libXext +, libXft +, libXt +, ncurses5 +, slang +} : + +stdenv.mkDerivation rec { + pname = "jed"; + version = "0.99-19"; + + src = fetchzip { + url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "sha256-vzeX0P+2+IuKtrX+2lQDeJj7VMDS6XurD2pb2jhxy2Q="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + gpm + libXext + libXft + libXt + ncurses5 + slang + ]; + + configureFlags = [ + "CC=cc" + "--with-slang=${slang}" + "JED_ROOT=${placeholder "out"}/share/jed" + ]; + + makeFlags = [ + "jed" "xjed" "rgrep" + ]; + + postPatch = '' + for i in autoconf/Makefile autoconf/Makefile.in \ + doc/tm/Makefile src/Makefile.in; do + sed -e 's|/bin/cp|cp|' -i $i + done + for i in autoconf/aclocal.m4 configure; do + sed -e 's|ncurses5|ncurses|' -i $i + done + ''; + + postInstall = '' + install -D src/objs/rgrep $out/bin + ''; + + meta = with stdenv.lib; { + description = "A programmable text editor written around S-Lang"; + longDescription = '' + JED is a freely available text editor for Unix, VMS, MSDOS, OS/2, BeOS, + QNX, and win9X/NT platforms. Although it is a powerful editor designed for + use by programmers, its drop-down menu facility make it one of the + friendliest text editors around. Hence it is ideal for composing simple + email messages as well as editing complex programs in a variety of + computer languages. + + JED makes extensive use of the S-Lang library, which endows it with the + powerful S-Lang scripting language. Some of its features are: + + - Color syntax highlighting on color terminals, e.g., Linux console or a + remote color terminal via dialup (as well as Xjed) + - Folding support + - Drop-down menus on _ALL_ terminals/platforms + - Emulation of Emacs, EDT, Wordstar, Borland, and Brief editors + - Extensible in the C-like S-Lang language making the editor completely + customizable. + - Capable of reading GNU info files from within JED's info browser + - A variety of programming modes (with syntax highlighting) are available + including C, C++, FORTRAN, TeX, HTML, SH, python, IDL, DCL, NROFF... + - Edit TeX files with AUC-TeX style editing (BiBTeX support too) + - Asynchronous subprocess support allowing one to compile from within the + editor + - Built-in support for the GPM mouse driver on Linux console + - Abbreviation mode and Dynamic abbreviation mode + - 8 bit clean with mute/dead key support + - Supported on most Unix, VMS, OS/2, MSDOS (386+), win9X/NT, QNX, and BeOS + systems + - Rectangular cut/paste; regular expressions; incremental searches; search + replace across multiple files; multiple windows; multiple buffers; shell + modes; directory editor (dired); mail; rmail; ispell; and much, much + more + ''; + homepage = "https://www.jedsoft.org/jed/index.html"; + license = licenses.gpl2Plus; + platforms = slang.meta.platforms; + }; +} +# TODO: build tex documentation diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix new file mode 100644 index 0000000000000..4a22c4d4d955f --- /dev/null +++ b/pkgs/applications/editors/jove/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub +, groff +, ncurses +, makeWrapper +} : + +stdenv.mkDerivation rec { + pname = "jove"; + version = "4.17.3.6"; + + src = fetchFromGitHub { + owner = "jonmacs"; + repo = "jove"; + rev = version; + sha256 = "sha256-uQRNKV06ipOHrOsvsceqIFGGlRv5qOQy18q0tFkR6Kg="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + groff + ncurses + ]; + + dontConfigure = true; + + preBuild = '' + makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \ + TERMCAPLIB=-lncurses JOVEHOME=${placeholder "out"}) + ''; + + postInstall = '' + wrapProgram $out/bin/teachjove \ + --prefix PATH ":" "$out/bin" + ''; + + meta = with stdenv.lib; { + description = "Jonathan's Own Version or Emacs"; + homepage = "https://github.com/jonmacs/jove"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index ad83bd43af2f2..40e46d9295f93 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -7,14 +7,14 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - + src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; - + buildInputs = [ qtbase ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 3a21eec07f424..527228742c4cd 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH - > + > EOF done diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b546aae790a7f..b4ad25f60c250 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -48,7 +48,6 @@ in ]; dontFixCmake = true; - enableParallelBuilding = true; buildInputs = [ gperf diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 323f08c23f871..5a75a9284f038 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -27,8 +27,6 @@ let nativeBuildInputs = [ cmake doxygen ]; - enableParallelBuilding = true; - preCheck = '' # The GUI tests require a running X server, disable them sed -i ../test/CMakeLists.txt \ diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3fe845a067b3d..97e8378d94e8f 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -109,8 +109,6 @@ mkDerivation rec { popd ''; - enableParallelBuilding = true; - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 18437f5ff49eb..6bf1ca5ada3e6 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -36,8 +36,6 @@ mkDerivation rec { ''${qtWrapperArgs[@]} ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = "https://github.com/Sigil-Ebook/Sigil/"; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 9c37d00c9ee17..f967f28f4df52 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -31,8 +31,6 @@ mkDerivation { sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ guile_1_8 diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 363f3b8c84d90..95be29abba54a 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -40,8 +40,6 @@ in "-DGITBRANCH=${gitBranch}" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A computer-aided design (CAD) tool from a parallel universe"; homepage = "https://github.com/mkeeter/antimony"; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index e6865d2d8f07a..84a005445316f 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers. # `RUNPATH` doesn't propagate throughout the whole application, but only # from the module performing the `dlopen()`. - # + # # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so` # files in $out/lib/apitrace/wrappers. - # + # # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd` # and other dispatcher libraries, and run `dlopen()` by themselves. - # + # # As `RUNPATH` doesn't propagate through the whole library, and they're now the # library doing the real `dlopen()`, they also need to have # `/run-opengl-driver[-32]` added to their `RUNPATH`. diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 14af98ebc48ba..5c649b384c789 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; }; - buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpng libtiff libjpeg panotools libxml2 ]; patches = [ (fetchurl { diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 5832e97d4399e..fcd871bf5ab3a 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -109,8 +109,6 @@ mkDerivation rec { threadweaver ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index fb68276b168c6..a0d28689ae7b6 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { version = "0.4.13"; format = "other"; - + src = fetchFromGitHub { owner = "maoschanz"; repo = pname; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index f1e366b65699e..1c272cf44e24f 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -27,7 +27,7 @@ in mkDerivation rec { ]; buildInputs = [ - cmake coin3d xercesc ode eigen opencascade-occt gts + coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index 11d203746e1ae..a0356d1298180 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; - buildInputs = [ libjpeg libGLU libGL freeglut zlib cmake libX11 libxml2 libpng - libXxf86vm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ]; postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index c96ea765d43f0..75c43f06d2c3a 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { preBuild = '' qmake qt/fstl.pro ''; - + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv fstl.app $out/Applications diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 7314ff893b00d..1a8a552aa4f48 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index da35891897252..bbbd4ed351bc2 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -14,7 +14,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "KindleComicConverter"; sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; }; - + propagatedBuildInputs = with python3Packages ; [ pillow pyqt5 diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 9b96b30c62b11..eaef8c13b7c8f 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -27,8 +27,6 @@ mkDerivation rec { kconfig kinit kio kparts kwidgetsaddons ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A Graphviz dot graph viewer for KDE"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 50962d54eb231..67b64ee575c06 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -84,8 +84,6 @@ mkDerivation rec { # | hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = { description = "A system for processing and editing 3D triangular meshes"; homepage = "https://www.meshlab.net/"; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index d23c02dbbdff6..d79a356657436 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -27,8 +27,6 @@ mkDerivation rec { sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; }; - enableParallelBuilding = true; - setSourceRoot = '' sourceRoot=$(echo */ImageLounge) ''; diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index fa3034cb3b074..e699b453bcf54 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: stdenv.mkDerivation { - version = "2018-08-15"; pname = "pbrt-v3"; @@ -18,12 +17,13 @@ stdenv.mkDerivation { ./openexr-cmake-3.12.patch ]; - buildInputs = [ git flex bison cmake zlib ]; + nativeBuildInputs = [ flex bison cmake ]; + buildInputs = [ zlib ]; meta = with stdenv.lib; { homepage = "http://pbrt.org"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; - platforms = platforms.linux ; + platforms = platforms.linux; license = licenses.bsd2; maintainers = [ maintainers.juliendehos ]; priority = 10; diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 09b5bd378397f..3c89f3ffac03f 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation { buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 71c63bc82aa23..4f470b014afe5 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -37,8 +37,6 @@ mkDerivation rec { export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; - enableParallelBuilding = true; - meta = { homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 4371bc5838ed6..14a46bbfcc873 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake ''; - enableParallelBuilding = true; - meta = { description = "RAW converter and digital photo processing software"; homepage = "http://www.rawtherapee.com/"; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index c1255c016f4fa..c2edecb858f7e 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -61,8 +61,6 @@ mkDerivation rec { addOpenGLRunpath $out/lib/librenderdoc.so ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = "https://renderdoc.org/"; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 2ada41ac98a1d..4ad5c24ddd683 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { name = "brscan4-0.4.8-1"; - src = + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index bc54f3aa627a7..5e05072f7b58b 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -8,9 +8,8 @@ stdenv.mkDerivation { sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; }; - buildInputs = [ qt4 cmake libjpeg libtiff boost ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 libjpeg libtiff boost ]; meta = { homepage = "http://scantailor.org/"; diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 11e37c4bf649d..f5478f684fe63 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # for tracking usage. consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6"; consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216"; - + src = fetchFromGitHub { owner = "olav-st"; repo = "screencloud"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim"; }; - buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; patchPhase = '' # Required to make the configure script work. Normally, screencloud's @@ -28,8 +29,6 @@ stdenv.mkDerivation rec { substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" "" ''; - enableParallelBuilding = true; - # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not # to add the argument for us. dontAddPrefix = true; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 0df161cd4731e..d9877afad86f8 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { cd src ''; - enableParallelBuilding = true; - - buildInputs = [ cmake qt4 fftw ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 fftw ]; cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index bd084b4287dc1..18d8d546a7775 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { json_c fontconfig gtkmm3 pangomm glew libGLU xorg.libpthreadstubs xorg.libXdmcp pcre ]; - enableParallelBuilding = true; preConfigure = '' patch CMakeLists.txt <<EOF diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 5c43d717913bc..9f4fc95df77d2 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -18,8 +18,6 @@ mkDerivation rec { buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ]; - enableParallelBuilding = true; - # We don't have virtualbox sdk so disable plugin cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 48efafa74fcd7..aa052426e7244 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy , gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook }: @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; nativeBuildInputs = [ - pkgconfig + cmake + pkg-config wrapGAppsHook ]; buildInputs = [ - cmake poppler pcre libxkbcommon epoxy freetype gtk3 libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index ebb04a30ab866..7f8ff3d6d2198 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; unpackPhase = '' - tar -zxf $src + tar -zxf $src ''; installPhase = '' diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e5eaabdc399b5..905e765185c27 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -128,8 +128,6 @@ stdenv.mkDerivation rec { # libstdc++ in our RPATH. Sigh. NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; - enableParallelBuilding = true; - blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); # --python-expr is used to workaround https://developer.blender.org/T74304 diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 842ef2262d9fe..eb4ac9c9b34da 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ qmake ]; - + sourceRoot = "source/src"; installPhase = '' diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 98fe799b11000..00820874bce4e 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp $src $out/bin/deadd-notification-center chmod +x $out/bin/deadd-notification-center - sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service + sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 44e9fe8828346..e9a50e88b23ca 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY="; }; - buildInputs = [ cmake qtbase qttools file solid ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qttools file solid ]; cmakeFlags = [ "-DQT5BUILD=true" ]; diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/applications/misc/elf-dissector/default.nix index 36ceb49d5c4be..6edbcc0cce2ea 100644 --- a/pkgs/applications/misc/elf-dissector/default.nix +++ b/pkgs/applications/misc/elf-dissector/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://invent.kde.org/sdk/elf-dissector"; description = "Tools for inspecting, analyzing and optimizing ELF files"; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index de2ed0d15964b..eb7314a870dba 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -76,8 +76,6 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "share" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "An orthodox file manager"; homepage = "https://github.com/elfmz/far2l"; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 34d5a45b8ea1e..5af6ae03f24cf 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "fme"; version = "1.1.3"; - + src = fetchurl { url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz"; sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix index 91a7b0ed37fd2..90ab3b11c13dd 100644 --- a/pkgs/applications/misc/fusee-interfacee-tk/default.nix +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -1,40 +1,40 @@ -{ stdenv , fetchFromGitHub , python3 , makeWrapper }: +{ stdenv , fetchFromGitHub , python3 , makeWrapper }: -let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); -in stdenv.mkDerivation rec { +let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); +in stdenv.mkDerivation rec { pname = "fusee-interfacee-tk"; version = "1.0.1"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "nh-server"; repo = pname; - rev = "V${version}"; + rev = "V${version}"; sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - installPhase = '' + installPhase = '' mkdir -p $out/bin - - # The program isn't just called app, so I'm renaming it based on the repo name + + # The program isn't just called app, so I'm renaming it based on the repo name # It also isn't a standard program, so we need to append the shebang to the top - echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk + echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk cat app.py >> $out/bin/fusee-interfacee-tk - chmod +x $out/bin/fusee-interfacee-tk - - # app.py depends on these to run - cp *.py $out/bin/ + chmod +x $out/bin/fusee-interfacee-tk + + # app.py depends on these to run + cp *.py $out/bin/ cp intermezzo.bin $out/bin/intermezzo.bin ''; - meta = with stdenv.lib; { + meta = with stdenv.lib; { homepage = "https://github.com/nh-server/fusee-interfacee-tk"; description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; - longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. + longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. Must be run as sudo."; maintainers = with maintainers; [ kristian-brucaj ]; license = licenses.gpl2; }; -} +} diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index ff3408eb8dd29..6f1b824925ff1 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { ++ optionals dbiSupport [ libdbi libdbiDrivers ] ++ optionals postgresSupport [ postgresql ]; - enableParallelBuilding = true; - meta = { homepage = "https://wammu.eu/gammu/"; description = "Command line utility and library to control mobile phones"; diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh index 04485b146a04e..dec7367379e4e 100755 --- a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh +++ b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh @@ -43,7 +43,7 @@ if [ "ico" = "$rscFileExt" ]; then else wrestool -x --output=$tmp/ico -t14 $rscFile fi - + icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico mkdir -p $out diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index fdd11db509fc3..52feb338a1512 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }: +{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: stdenv.mkDerivation rec { pname = "keepassx2"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3"; }; - buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libgcrypt qt4 xorg.libXtst ]; meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index ff6b1e9de2dc6..068f7833c8635 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig +{ stdenv, fetchurl, makeWrapper, pkg-config , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake @@ -38,7 +38,7 @@ let sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; unpackPhase = '' # not a nice src archive: all the files are in the root :( @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zip python zlib xapian which icu libmicrohttpd lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 532166cf6fb08..2f513634259b5 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, fetchpatch +{ stdenv, pkg-config, fetchFromGitHub, fetchpatch , cmake, boost , portmidi, sqlite , freetype, libpng, pngpp, zlib @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p"; }; - enableParallelBuilding = true; - patches = [ (fetchpatch { url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch"; @@ -29,9 +27,9 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost + boost portmidi sqlite freetype libpng pngpp zlib wxGTK30 wxsqlite3 diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index 61b900c40122c..67ce53262864c 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} rm $out/usr/bin/minergate-cli mkdir -p $out/bin diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index cf7689367bd3e..a4969a34a86fe 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r * $out - cat > $out/bin/nb << EOF + cat > $out/bin/nb << EOF #!${bash}/bin/bash $out/nb "\$@" EOF diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index f5a88cbaee172..a93f4b247408b 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, gtk2, wxGTK30, libpulseaudio, curl, +{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, gettext, glib, portaudio }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext glib portaudio ]; cmakeFlags = [ @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; - enableParallelBuilding = true; - meta = { description = "A concise ChartPlotter/Navigator"; maintainers = [ stdenv.lib.maintainers.kragniz ]; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 6bdcd0da1fca0..770d12d27223c 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 017383a79a2d2..5800bcebef900 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation { buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ]; pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ]; - + patchPhase = '' substituteInPlace install.sh --replace "/usr/local" "$out" ''; - + installPhase = '' mkdir -p $out/bin $out/share/applications ./install.sh diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 3acb775450552..42412820c4860 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -27,7 +27,7 @@ let version = "4.4"; - binpath = stdenv.lib.makeBinPath [ + binpath = stdenv.lib.makeBinPath [ cabextract python gettext @@ -70,7 +70,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ + buildInputs = [ xorg.libX11 libGL python diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 674570ec3dd78..391868503c2d2 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }: +{ stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }: stdenv.mkDerivation { name = "posterazor-1.5.1"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake unzip libXpm fltk13 freeimage ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; + buildInputs = [ libXpm fltk13 freeimage ]; unpackPhase = '' unzip $src -d posterazor diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 79ad84e99be46..d715e08fbe0d0 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { pname = "prusa-slicer"; version = "2.2.0"; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 6a9de9e600f4d..0e0ddffaac072 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" ]; - enableParallelBuilding = true; postPatch = '' # Fix perl scripts used during the build. diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix index 9ae65a962ddcd..cb30571e0552b 100644 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -63,8 +63,6 @@ mkDerivation rec { "-DEXIF_INCLUDE_DIRS=${libexif}/include" ]; - enableParallelBuilding = true; - postPatch = '' substituteInPlace ConfigureChecks.cmake \ --replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt" diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index 8705abd92596e..22b6dfbf33d59 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ libusb-compat-0_1 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "http://www.qlandkarte.org/"; description = "Garmin Device Drivers for QlandkarteGT"; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 913d2bc3c6ba3..6cdd97e666f30 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -17,8 +17,6 @@ mkDerivation { libeb lzo qtbase qtmultimedia qttools qtwebengine ]; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 70d9f600fa03b..cdb4f60382117 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -53,8 +53,6 @@ mkDerivation rec { runHook postInstall ''; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/sieren/QSyncthingTray/"; description = "A Traybar Application for Syncthing written in C++"; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index e93baa997c86c..f278cf7fd9614 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index 1eaf907b7edfc..056ba196cf571 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index 17c5ec9be2657..56063c737ab4c 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -24,7 +24,7 @@ in mkDerivation { patchPhase = '' patchShebangs configure ''; - + installPhase = if stdenv.isDarwin then '' mkdir -p $out/Applications cp -r sleepyhead/SleepyHead.app $out/Applications diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index 27d5610956d03..24fbb985beffa 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; }; - buildInputs = [ cmake qt4 qscintilla ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 qscintilla ]; prePatch = '' sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index c52573785ef66..d3a5eb7ec24fe 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0yzprwflky9a7zxa3zic7gvdwqg0zy49zvrqkdxng2k1ng78k3s7"; }; - nativeBuildInputs = [ imlib2 libX11 ]; + nativeBuildInputs = [ imlib2 libX11 ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index d8773240bac18..509f5f55e6dbe 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -91,8 +91,6 @@ in stdenv.mkDerivation { "-DNO_PRINTING=OFF" ]; - enableParallelBuilding = true; - passthru = { inherit version libdc googlemaps; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 4c577049f44a3..b7564fd2402df 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "tasksh"; version = "1.2.0"; - enableParallelBuilding = true; - src = fetchurl { url = "https://taskwarrior.org/download/${pname}-${version}.tar.gz"; sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index fa725ad9c96c7..7037b40816ca1 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -42,7 +42,6 @@ mkDerivation rec { ]; buildInputs = [ - cmake exempi extra-cmake-modules karchive diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 7b1d3c302b1db..380f1d437f118 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "timewarrior"; version = "1.4.2"; - enableParallelBuilding = true; - src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 9d57b4fcfac0a..dabdad137af37 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -22,5 +22,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zoltanp/xrandr-invert-colors"; maintainers = [stdenv.lib.maintainers.magnetophon ]; platforms = platforms.linux; - }; + }; } diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index 02559691f4d1d..a5bd8a02ebfed 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ glib libwnck3 ]; - enableParallelBuilding = true; - postInstall = '' wrapProgram $out/bin/xsuspender \ --prefix PATH : "${makeBinPath [ procps ]}" diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 3c2aace79b267..49d67690bf1fd 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -47,8 +47,6 @@ mkDerivation rec { wrapQtAppsHook ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; homepage = "https://community.kde.org/Incubator/Projects/Falkon"; diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index de523b14ba646..83f4d267f9591 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -20,69 +20,19 @@ stdenv.mkDerivation rec { patches = [ # configure tries to determine if `ping6` or the newer, combined # `ping` is installed by using `ping -6` which would fail. - (pkgs.writeText "firehol-ping6.patch" - '' - --- a/m4/ax_check_ping_ipv6.m4 - +++ b/m4/ax_check_ping_ipv6.m4 - @@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6], - - AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt], - [ - - ac_cv_ping_6_opt=no - - if test -n "$PING"; then - - echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD - - $PING -6 -c 1 ::1 > conftest.out 2>&1 - - if test "$?" = 0; then - - ac_cv_ping_6_opt=yes - - fi - - cat conftest.out >&AS_MESSAGE_LOG_FD - - rm -f conftest.out - - fi - + ac_cv_ping_6_opt=yes - + #if test -n "$PING"; then - + # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD - + # $PING -6 -c 1 ::1 > conftest.out 2>&1 - + # if test "$?" = 0; then - + # ac_cv_ping_6_opt=yes - + # fi - + # cat conftest.out >&AS_MESSAGE_LOG_FD - + # rm -f conftest.out - + #fi - ]) - - AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ - '') + ./firehol-ping6.patch # put firehol config files in /etc/firehol (not $out/etc/firehol) # to avoid error on startup, see #35114 - (pkgs.writeText "firehol-sysconfdir.patch" - '' - --- a/sbin/install.config.in.in - +++ b/sbin/install.config.in.in - @@ -4 +4 @@ - -SYSCONFDIR="@sysconfdir_POST@" - +SYSCONFDIR="/etc" - '') + ./firehol-sysconfdir.patch - # we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname - # will be interpreted as IFS -> error. this might be considered an upstream bug - # but only appears when there are dashes in the command path - (pkgs.writeText "firehol-uname-command.patch" - '' - --- a/sbin/firehol - +++ b/sbin/firehol - @@ -10295,7 +10295,7 @@ - kmaj=$1 - kmin=$2 - - - set -- $($UNAME_CMD -r) - + set -- $("$UNAME_CMD" -r) - eval $kmaj=\$1 $kmin=\$2 - } - kernel_maj_min KERNELMAJ KERNELMIN - '') + # we must quote "$UNAME_CMD", or the dash in + # /nix/store/...-coreutils-.../bin/uname will be interpreted as + # IFS -> error. this might be considered an upstream bug but only + # appears when there are dashes in the command path + ./firehol-uname-command.patch ]; - + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ curl iprange iproute ipset iptables iputils kmod diff --git a/pkgs/applications/networking/firehol/firehol-ping6.patch b/pkgs/applications/networking/firehol/firehol-ping6.patch new file mode 100644 index 0000000000000..7e06e503ef6fc --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-ping6.patch @@ -0,0 +1,29 @@ +--- a/m4/ax_check_ping_ipv6.m4 ++++ b/m4/ax_check_ping_ipv6.m4 +@@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6], + + AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt], + [ +- ac_cv_ping_6_opt=no +- if test -n "$PING"; then +- echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD +- $PING -6 -c 1 ::1 > conftest.out 2>&1 +- if test "$?" = 0; then +- ac_cv_ping_6_opt=yes +- fi +- cat conftest.out >&AS_MESSAGE_LOG_FD +- rm -f conftest.out +- fi ++ ac_cv_ping_6_opt=yes ++ #if test -n "$PING"; then ++ # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD ++ # $PING -6 -c 1 ::1 > conftest.out 2>&1 ++ # if test "$?" = 0; then ++ # ac_cv_ping_6_opt=yes ++ # fi ++ # cat conftest.out >&AS_MESSAGE_LOG_FD ++ # rm -f conftest.out ++ #fi + ]) + + AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ diff --git a/pkgs/applications/networking/firehol/firehol-sysconfdir.patch b/pkgs/applications/networking/firehol/firehol-sysconfdir.patch new file mode 100644 index 0000000000000..c541dd585acc4 --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-sysconfdir.patch @@ -0,0 +1,5 @@ +--- a/sbin/install.config.in.in ++++ b/sbin/install.config.in.in +@@ -4,1 +4,1 @@ +-SYSCONFDIR="@sysconfdir_POST@" ++SYSCONFDIR="/etc" diff --git a/pkgs/applications/networking/firehol/firehol-uname-command.patch b/pkgs/applications/networking/firehol/firehol-uname-command.patch new file mode 100644 index 0000000000000..92ab4cd932149 --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-uname-command.patch @@ -0,0 +1,11 @@ +--- a/sbin/firehol ++++ b/sbin/firehol +@@ -10295,7 +10295,7 @@ + kmaj=$1 + kmin=$2 + +- set -- $($UNAME_CMD -r) ++ set -- $("$UNAME_CMD" -r) + eval $kmaj=\$1 $kmin=\$2 + } + kernel_maj_min KERNELMAJ KERNELMIN diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix index 2a3d294c5ca6e..2967c4e535fe2 100644 --- a/pkgs/applications/networking/flent/http-getter.nix +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake -, curl, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, curl, pkg-config }: stdenv.mkDerivation { pname = "http-getter"; @@ -12,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl"; }; - buildInputs = [ cmake pkgconfig curl ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl ]; meta = with stdenv.lib; { homepage = "https://github.com/tohojo/http-getter"; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 336e3be074ddc..8fa3a86e5c01e 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. inherit preConfigure; - enableParallelBuilding = true; - patches = stdenv.lib.optionals stdenv.cc.isClang [ # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 (fetchpatch { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 76b242659e7ad..327827b74f31a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc"; }; - buildInputs = [ pidgin cmake libxml2 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ pidgin libxml2 ]; preConfigure = '' sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 08c3ab96210ff..62b6c8f8e59c0 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -21,7 +21,6 @@ mkDerivation rec { qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libXScrnSaver hunspell ]; - enableParallelBuilding = true; meta = with lib; { homepage = "https://psi-im.org"; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index 775b9015eb0e1..5b7a402504d8b 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -19,11 +19,8 @@ stdenv.mkDerivation { inherit patches; - buildInputs = [ - cmake - asio - openssl - ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ asio openssl ]; meta = with stdenv.lib; { description = "HTTP framework for building networked applications"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index d4cc5293a9beb..8ea4362e7e349 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -52,8 +52,6 @@ in mkDerivation rec { pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst ]; - enableParallelBuilding = true; - cmakeFlags = [ "-Ddisable_autoupdate=ON" # We're allowed to used the API ID of the Snap package: diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 76743621fc74c..4afd488c68d11 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -49,13 +49,11 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch ]; - enableParallelBuilding = true; - # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; - buildInputs = - [ cmake makeWrapper qtbase ] + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ qtbase ] ++ lib.optionals buildCore [qtscript qca-qt5] ++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals (buildClient && withKDE) [ diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 404810e5f2458..7343b7e1a5541 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls, gettext -, zlib, curl, pkgconfig, libgcrypt +, zlib, curl, pkg-config, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv , asciidoctor # manpages , guileSupport ? true, guile @@ -37,7 +37,6 @@ let outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - enableParallelBuilding = true; cmakeFlags = with stdenv.lib; [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" @@ -48,10 +47,10 @@ let ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; + nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ]; buildInputs = with stdenv.lib; [ - ncurses openssl aspell gnutls gettext zlib curl pkgconfig - libgcrypt makeWrapper cmake asciidoctor - ] + ncurses openssl aspell gnutls gettext zlib curl + libgcrypt ] ++ optionals stdenv.isDarwin [ libobjc libresolv ] ++ concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index d990dfb39d2be..ed8826729ccfd 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -21,8 +21,6 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = "https://owncloud.org"; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 9355bfa5b8d9c..7bb0866e12f9e 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -54,8 +54,6 @@ stdenv.mkDerivation rec { "-DWITH_LUASCRIPTS=ON" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp"; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 19be24bd1b184..94a4642b2de11 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -22,8 +22,6 @@ mkDerivation rec { libktorrent taglib libgcrypt kplotting ]; - enableParallelBuilding = true; - meta = with lib; { description = "KDE integrated BtTorrent client"; homepage = "https://www.kde.org/applications/internet/ktorrent/"; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 2e69ad23e14c5..d83cc6ad184fc 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -44,8 +44,6 @@ mkDerivation rec { else "qbittorrent-nox" } --prefix PATH : ${makeBinPath [ python3 ]}"; - enableParallelBuilding = true; - meta = { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index cb29857e168d5..c5008bf0790bb 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -92,8 +92,6 @@ in stdenv.mkDerivation { cp ../wiretap/*.h $dev/include/wiretap ''); - enableParallelBuilding = true; - dontFixCmake = true; shellHook = '' diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 29a96aac5c465..898ee032fc473 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -82,8 +82,6 @@ stdenv.mkDerivation rec { ''; doCheck = false; - enableParallelBuilding = true; - meta = { description = "Personal and small-business financial-accounting application"; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index e15615f78a345..093d20906a4d4 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; - enableParallelBuilding = true; - nativeBuildInputs = [ doxygen extra-cmake-modules graphviz kdoctools python2 python3Packages.wrapPython wrapQtAppsHook diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 543545de26310..7f543c9bbcc6c 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake texinfo ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 779a5cb0fea38..4cc2077539090 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -18,8 +18,6 @@ in stdenv.mkDerivation rec { sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = with xorg; [ freetype lcms libtiff libxml2 libart_lgpl qt4 diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index c2c300b87486e..bb855feebab5f 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -43,8 +43,6 @@ mkDerivation rec { sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s="; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index d826b9f54f6a1..5216c896e72d2 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; - buildInputs = [ qt4 cmake sqlite ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 sqlite ]; meta = with stdenv.lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index a369486278be0..1aa04dc43d721 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { mbelib libsndfile itpp ] ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; - enableParallelBuilding = true; - doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index d7e2d44c75cec..782640c95dfc0 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -8,7 +8,7 @@ , gflags , gnuradio , orc -, pkgconfig +, pkg-config , pythonPackages , uhd , log4cpp @@ -29,17 +29,16 @@ stdenv.mkDerivation rec { sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby"; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ armadillo boost.dev - cmake glog gmock openssl.dev gflags gnuradio orc - pkgconfig pythonPackages.Mako pythonPackages.six @@ -53,8 +52,6 @@ stdenv.mkDerivation rec { protobuf ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DGFlags_ROOT_DIR=${gflags}/lib" "-DGLOG_INCLUDE_DIR=${glog}/include" diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 46d46d1c3255a..82187230ee3e3 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio , makeWrapper, cppunit, gr-osmosdr, log4cpp , pythonSupport ? true, python, swig }: @@ -17,10 +17,9 @@ stdenv.mkDerivation { sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper cppunit gr-osmosdr log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] + ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do @@ -28,8 +27,6 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for ais"; homepage = "https://github.com/bistromath/gr-ais"; diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 4e2406fc07a0e..b41e7cdb682e2 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp , makeWrapper, cppunit, libosmocore, gr-osmosdr , pythonSupport ? true, python, swig }: @@ -16,9 +16,9 @@ stdenv.mkDerivation { sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp + boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' @@ -27,8 +27,6 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for gsm"; homepage = "https://github.com/ptrkrysik/gr-gsm"; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index b2f99164bec68..f7ec95f8e71b4 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -28,8 +28,6 @@ in stdenv.mkDerivation { ] ++ stdenv.lib.optionals pythonSupport [ python ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio source and sink blocks for LimeSDR"; homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index 3435d5cdb4f0b..7ddac3c227269 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, uhd , makeWrapper, libsodium, cppunit, log4cpp , pythonSupport ? true, python, swig }: @@ -16,9 +16,9 @@ stdenv.mkDerivation { sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio uhd makeWrapper libsodium cppunit log4cpp + boost gnuradio uhd makeWrapper libsodium cppunit log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' @@ -27,8 +27,6 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for encryption"; homepage = "https://github.com/stwunsch/gr-nacl"; diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 9eb6fe648d02b..50889c66d6b5c 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper +{ stdenv, fetchgit, cmake, pkg-config, makeWrapper , boost , pythonSupport ? true, python, swig , airspy @@ -23,10 +23,9 @@ stdenv.mkDerivation rec { sha256 = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ - cmake makeWrapper boost log4cpp - airspy gnuradio hackrf libbladeRF rtl-sdr uhd + boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] ++ stdenv.lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; @@ -36,8 +35,6 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for OsmoSDR and rtl-sdr"; homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 72838569bb3bb..f28ec8ded2db5 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp , makeWrapper, pythonSupport ? true, python, swig }: @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { sha256 = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio makeWrapper log4cpp + boost gnuradio makeWrapper log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Gnuradio block for radio data system"; homepage = "https://github.com/bastibl/gr-rds"; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index e06d04ca53f67..31e6bc3754016 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -23,8 +23,6 @@ mkDerivation rec { qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; - enableParallelBuilding = true; - postInstall = '' install -vD $src/gqrx.desktop -t "$out/share/applications/" install -vD $src/resources/icons/gqrx.svg -t "$out/share/pixmaps/" diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index e06fcb5d3e671..185e08f4062f5 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -29,7 +29,6 @@ in stdenv.mkDerivation rec { "-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include" "../src" ]; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ cmake pkgconfig doxygen groff wrapQtAppsHook ]; diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index fd5f5505a6726..3f060f9154339 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "00v4n8pvi5qi2psjnrw611w5gg5bdlaxbsny535fsci3smyygpc0"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - cmake expat openssl zlib diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index e7ddb5787fac4..d9276f6f1f1f7 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -54,8 +54,6 @@ stdenv.mkDerivation rec { sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; }; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_LIBUHD=ON" "-DENABLE_USB=ON" diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 77969c5ca3f92..87c04dd3b98e9 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -39,8 +39,6 @@ in mkDerivation { "-DRTLSDR=true" "-DSOAPYSDR=true" ]; - enableParallelBuilding = true; - meta = with lib; { description = "A DAB/DAB+ Software Radio"; homepage = "https://www.welle.io/"; diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index 566fd61f1a7b5..ca8651aa9e621 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - makeWrapper cmake curl boost gdal glew soil libX11 libXi libXxf86vm libXcursor libXrandr libXinerama ]; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index a9661ee2db787..f9d3e4d4e1279 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { "-DEZMINC_BUILD_MRFSEG=TRUE" "-DEZMINC_BUILD_DD=TRUE" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Collection of Perl and shell scripts for processing MINC files"; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index ece218eea37dd..caf759ce7e3f4 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; - enableParallelBuilding = true; - postInstall = '' for file in $out/bin/*; do wrapProgram $file --set ANTSPATH "$out/bin" diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 41805c15aed59..7aef4c0728193 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index cfd1206f2314f..a59e5d2be2d5d 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake git ]; buildInputs = [ libyamlcpp ]; diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix index 35ef280ed676e..3168ecb1cf832 100644 --- a/pkgs/applications/science/biology/megahit/default.nix +++ b/pkgs/applications/science/biology/megahit/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 201e38cfc5383..876cc8ebaa71d 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.2.1"; pname = "messer-slim"; src = fetchurl { @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1j3ssjvxpsc21mmzj59kwimglz8pdazi5w6wplmx11x744k77wa1"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; - cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; meta = { @@ -24,4 +22,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index c594897f4b6fd..897c1994a5008 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/BIC-MNI/minc-tools"; description = "Command-line utilities for working with MINC files"; diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index fd7dc4f1fbb4f..4e965d70fe310 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg"; diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix index 38194697223de..98cca7815eaa7 100644 --- a/pkgs/applications/science/biology/niftyseg/default.nix +++ b/pkgs/applications/science/biology/niftyseg/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen zlib ]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg"; diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index 076e459c8f0bd..7ecee60c4b1b7 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -26,8 +26,6 @@ pythonPackages.buildPythonApplication rec { doCheck = true; - enableParallelBuilding = true; - meta = with stdenv.lib ; { description = "Management of analyses and data in DNA metabarcoding"; homepage = "https://git.metabarcoding.org/obitools/obitools3"; diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index 17d9c3dbb55cd..298bb98ec990c 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./somatic-sniper.patch ]; - buildInputs = [ cmake zlib ncurses ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ncurses ]; enableParallelBuilding = false; diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index 1c63956375739..72962455ac90b 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -12,7 +12,6 @@ clangStdenv.mkDerivation rec { sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i"; }; - enableParallelBuilding = true; nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ]; buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ]; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 317a83371adbd..334a85d3a5f0f 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -38,8 +38,6 @@ in stdenv.mkDerivation { openssh ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DOPENMP=ON" "-DGA=ON" diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index c2d7cefec9b83..7aafa70f7fa1a 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -45,8 +45,6 @@ mkDerivation { rm $out/bin/AppCSXCAD.sh ''; - enableParallelBuilding = true; - meta = with lib; { description = "Minimal Application using the QCSXCAD library"; homepage = "https://github.com/thliebig/AppCSXCAD"; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index c90ceac6788f5..5cf9ab1ae6fb0 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase qttools qtsvg qwt ]; - enableParallelBuilding = true; - meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = "http://caneda.org"; diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index adc6a60be8532..f1ea93760039e 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A C++ library to describe geometrical objects"; homepage = "https://github.com/thliebig/CSXCAD"; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index e61017ea330da..8c5e9e41aaccd 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -34,8 +34,6 @@ mkDerivation rec { python3 ]; - enableParallelBuilding = true; - meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; homepage = "https://www.dreamsourcelab.com/"; diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index f7c8dd7467a3c..e1063f8e26cf0 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -63,8 +63,6 @@ stdenv.mkDerivation { -o $out/share/openEMS/matlab/h5readatt_octave.oct ''; - enableParallelBuilding = true; - meta = with lib; { description = "Open Source Electromagnetic Field Solver"; homepage = "http://openems.de/index.php/Main_Page.html"; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 9b6e75c77ba85..a50609e84a8c3 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake, graphviz, pkgconfig }: +{ stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { name = "qfsm-0.54.0"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 cmake graphviz ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qt4 graphviz ]; patches = [ ./drop-hardcoded-prefix.patch @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 62a9ae8b73bee..9b143f1c3f1ff 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { ./cmakelists.patch ]; - buildInputs = [ flex bison qt4 libX11 cmake gperf adms ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ qt4 libX11 gperf adms ]; meta = { description = "Integrated circuit simulator"; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 426c5a9df3237..0e60122a59887 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; - enableParallelBuilding = true; installPhase = "mkdir -p $out/bin && mv abc $out/bin"; # needed by yosys diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 6b48c1e344883..6f8120c7b8e7c 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ cmake zlib boost.out boost.dev ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib boost.out boost.dev ]; NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things ++ stdenv.lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 54a2f02255188..1a92247c54d39 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -35,9 +35,6 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Production" ]; - - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "http://cvc4.cs.stanford.edu/web/"; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index a465420953737..cc14fd7706aba 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { cmakeFlags = lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; - enableParallelBuilding = true; - configurePhase = '' python build.py release ''; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 0684abd5ab313..f5b7ccd76b175 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gmp ]; - enableParallelBuilding = true; cmakeDir = "../src"; diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 612c9d6f92a2c..9ac4f2a6c6bbe 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { sha256 = "1xv3j487zhh1zf2b4v19xzw63s2sgjhg8d62a0kxxyknfmdf3khl"; }; - buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake makeWrapper ninja ]; + buildInputs = [ gmp mpfr python gperftools ]; preConfigure = '' patchShebangs bin/leantags diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index eb83eaf79c55d..584988f2b408e 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake libGLU libGL qt5.qtbase boost ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL qt5.qtbase boost ]; meta = with stdenv.lib; { description = "A toolset for model-checking concurrent systems and protocols"; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 63440213920ce..19fba6e299360 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -31,7 +31,8 @@ let core = stdenv.mkDerivation { name = "${pname}-${version}"; inherit src patches; - buildInputs = [ cmake zlib gmp jdk8 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib gmp jdk8 ]; cmakeFlags = [ "-DBUILD_STATIC=OFF" diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index dd00eda1b5712..fcffc239b48f0 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -24,9 +24,6 @@ stdenv.mkDerivation rec { ) ''; - # seems to build fine now, may revert if concurrency does become an issue - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Simple Theorem Prover"; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index a2c26de7a2dcf..f448e66d94b96 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { CCACHE_DISABLE="1"; CCACHE_DIR=".ccache"; + nativeBuildInputs = [ cmake ]; buildInputs = with lib; [ - blas lapack bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) @@ -87,8 +88,6 @@ stdenv.mkDerivation rec { (flag "OpenCV" opencvSupport) ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4a6a2dc6c7e0f..c99adea9a6402 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake doxygen ]; cmakeFlags = diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 401454a6b69ba..a348210179e20 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -90,8 +90,6 @@ in stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - meta = with lib; { # Newer cub is included with cudatoolkit now and it breaks the build. # https://github.com/Microsoft/CNTK/issues/3191 diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 3d74421669ea7..68df53aee3934 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -43,8 +43,6 @@ stdenv.mkDerivation rec { rm "$out"/lib/*.a ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; homepage = "https://mxnet.incubator.apache.org/"; diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 4bef967bc08a5..ade58b28ab64b 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ - qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj cmake python2 + qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2 doxygen graphviz gmp mpfr (boost.override { enablePython = true; diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 268ae53401f5c..589b137002305 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - patchPhase = '' cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh cp -fv ${fakegit}/bin/checkout-svn.sh libraries/checkout-svn.sh diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index efdd86f0ab2dc..f8533677b7ae4 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -50,8 +50,6 @@ stdenv.mkDerivation { dontUseCmakeBuildDir = true; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community"; homepage = "http://cdcseacave.github.io/openMVS/"; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index cab26577bd0b8..c42f80da352a8 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 , libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash , Cocoa, OpenGL, noSplash ? false }: @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ln448lszw4d6jmbdphkr2plwxxlhmjkla48vmmq750xc1lxlfrc"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -77,8 +77,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; - enableParallelBuilding = true; - setupHook = ./setup-hook.sh; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 03b206973103d..2e9fcdb35a214 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; - enableParallelBuilding = true; - postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 11d73095834f9..7cc702f2d5388 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -92,8 +92,6 @@ stdenv.mkDerivation rec { EOW ''; - enableParallelBuilding = true; - meta = { description = "Framework for the simulation of distributed applications"; longDescription = '' diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 0d749bb9be4fc..6f7735db82e08 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { ln -sv "${externals}" externals ''; - buildInputs = [ cmake qt4 libGLU libGL ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 libGLU libGL ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index a76fe3a72774a..7e10ecaba36fe 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { ./fix-cmake.patch ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://elmerfem.org/"; description = "A finite element software for multiphysical problems"; diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix index 6623f5def4cb7..0acf0989c6364 100644 --- a/pkgs/applications/science/programming/scyther/cli.nix +++ b/pkgs/applications/science/programming/scyther/cli.nix @@ -6,12 +6,8 @@ stdenv.mkDerivation { inherit src meta; - buildInputs = [ - cmake - glibc.static - flex - bison - ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ glibc.static ]; patchPhase = '' # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index df2c569a31c75..aa0062f8f3ac9 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a"; }; - buildInputs = [ cmake ace ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ace ]; cmakeFlags = [ "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 57f6703762d18..8c7f323cbb66c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -23,7 +23,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.29.2"; + version = "2.30.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1h87yv117ypnc0yi86941089c14n91gixk8b6shj2y35prp47z7j"; + sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; @@ -52,12 +52,6 @@ stdenv.mkDerivation { ./ssh-path.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch - (fetchpatch { - # https://github.com/git/git/pull/925 - name = "make-manual-reproducible.patch"; - url = "https://github.com/git/git/commit/7a68e9e0b8eda91eb576bbbc5ed66298f3ab761c.patch"; - sha256 = "02naws82pd3vvwrrgqn91kid8qkjihyjaz1ahgjz8qlmnn2avf5n"; - }) ]; postPatch = '' @@ -298,6 +292,7 @@ stdenv.mkDerivation { disable_test t0001-init shared disable_test t1301-shared-repo disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository' + disable_test t4129-apply-samemode 'do not use core.sharedRepository for working tree files' # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index d19f9862fca87..7a082033af48d 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -13,8 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf"; }; - buildInputs = [ cmake libzip gnupg ] ++ - (if stdenv.isDarwin then [ libiconv CoreFoundation Security ] else []); + nativeBuildInputs = [ cmake ]; + buildInputs = [ libzip gnupg ] + ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index a60250ee0ff1a..b295e8922484e 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -83,7 +83,6 @@ let repo = name; inherit rev sha256; }; - enableParallelBuilding = true; } // attrs'); ffmpeg = kodiDependency rec { @@ -242,8 +241,6 @@ in stdenv.mkDerivation { "-DGBM_RENDER_SYSTEM=gles" ]; - enableParallelBuilding = true; - # 14 tests fail but the biggest issue is that every test takes 30 seconds - # I'm guessing there is a thing waiting to time out doCheck = false; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 12c16a744b08e..f957722ce7569 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -47,7 +47,8 @@ let self = rec { sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; }; - buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodiPlain libcec_platform tinyxml ]; }; mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: @@ -75,8 +76,8 @@ let self = rec { dontStrip = true; - buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] - ++ extraBuildInputs; + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs; inherit extraRuntimeDependencies; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 7cd02e69c5ef6..4b03bb5da46dc 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,5 +1,5 @@ config: -{ stdenv, cmake, pkgconfig, which +{ stdenv, cmake, pkg-config, which # Xen , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib @@ -66,7 +66,7 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cmake which |