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

Merge pull request #108423 from NixOS/staging-next 

Staging next
This commit is contained in:
Frederik Rietdijk 2021-01-11 07:53:57 +01:00 committed by GitHub
parent 5ca3562611 db7b9735f9
commit b4c0ea6a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
645 changed files with 2041 additions and 2190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/system/boot/stage-1.nix
View File

@ -513,7 +513,12 @@ in
};
boot.initrd.compressor = mkOption {
default = "gzip";
default = (
if lib.versionAtLeast config.boot.kernelPackages.kernel.version "5.9"
then "zstd"
else "gzip"
);
defaultText = "zstd if the kernel supports it (5.9+), gzip if not.";
type = types.unspecified; # We don't have a function type...
description = ''
The compressor to use on the initrd image. May be any of:

2
nixos/tests/systemd-journal.nix
View File

@ -13,6 +13,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
testScript = ''
machine.wait_for_unit("multi-user.target")
machine.succeed("journalctl --grep=systemd")
machine.succeed(
"${pkgs.curl}/bin/curl -s localhost:19531/machine | ${pkgs.jq}/bin/jq -e '.hostname == \"machine\"'"
)

6
pkgs/applications/audio/artyFX/default.nix
View File

@ -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/";

2
pkgs/applications/audio/cantata/default.nix
View File

@ -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" ])

4
pkgs/applications/audio/clementine/default.nix
View File

@ -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";

2
pkgs/applications/audio/csound/default.nix
View File

@ -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 {

6
pkgs/applications/audio/eq10q/default.nix
View File

@ -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 {

4
pkgs/applications/audio/eteroj.lv2/default.nix
View File

@ -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";

2
pkgs/applications/audio/game-music-emu/default.nix
View File

@ -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";

15
pkgs/applications/audio/kid3/default.nix
View File

@ -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 = ''

1
pkgs/applications/audio/lmms/default.nix
View File

@ -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)";

4
pkgs/applications/audio/ncpamixer/default.nix
View File

@ -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

10
pkgs/applications/audio/petrifoo/default.nix
View File

@ -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";

2
pkgs/applications/audio/qmmp/default.nix
View File

@ -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/";

2
pkgs/applications/audio/radiotray-ng/default.nix
View File

@ -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

2
pkgs/applications/audio/rosegarden/default.nix
View File

@ -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";

8
pkgs/applications/audio/sorcer/default.nix
View File

@ -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;
};

2
pkgs/applications/audio/soundkonverter/default.nix
View File

@ -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;

1
pkgs/applications/audio/traverso/default.nix
View File

@ -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; {

6
pkgs/applications/audio/ympd/default.nix
View File

@ -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";

2
pkgs/applications/blockchains/bitcoin-abc.nix
View File

@ -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= ''

2
pkgs/applications/blockchains/dero.nix
View File

@ -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/";

2
pkgs/applications/blockchains/masari.nix
View File

@ -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/";

2
pkgs/applications/blockchains/sumokoin.nix
View File

@ -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/";

2
pkgs/applications/editors/aseprite/default.nix
View File

@ -96,8 +96,6 @@ stdenv.mkDerivation rec {
rm -rf "$out"/include "$out"/lib
'';
enableParallelBuilding = true;
passthru = { inherit skia; };
meta = with lib; {

3
pkgs/applications/editors/bonzomatic/default.nix
View File

@ -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"

3
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -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"

95
pkgs/applications/editors/jed/default.nix Normal file
View File

@ -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

43
pkgs/applications/editors/jove/default.nix Normal file
View File

@ -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;
};
}

1
pkgs/applications/editors/neovim/default.nix
View File

@ -48,7 +48,6 @@ in
];
dontFixCmake = true;
enableParallelBuilding = true;
buildInputs = [
gperf

2
pkgs/applications/editors/neovim/qt.nix
View File

@ -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 \

2
pkgs/applications/editors/rstudio/default.nix
View File

@ -109,8 +109,6 @@ mkDerivation rec {
popd
'';
enableParallelBuilding = true;
cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
desktopItem = makeDesktopItem {

2
pkgs/applications/editors/sigil/default.nix
View File

@ -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/";

2
pkgs/applications/editors/texmacs/default.nix
View File

@ -31,8 +31,6 @@ mkDerivation {
sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
guile_1_8

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

@ -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";

3
pkgs/applications/graphics/autopanosiftc/default.nix
View File

@ -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 {

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

@ -109,8 +109,6 @@ mkDerivation rec {
threadweaver
];
enableParallelBuilding = true;
cmakeFlags = [
"-DENABLE_MYSQLSUPPORT=1"
"-DENABLE_INTERNALMYSQL=1"

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

@ -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; [

4
pkgs/applications/graphics/freepv/default.nix
View File

@ -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

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

@ -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 = ''

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

@ -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;

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

@ -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/";

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

@ -27,8 +27,6 @@ mkDerivation rec {
sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4";
};
enableParallelBuilding = true;
setSourceRoot = ''
sourceRoot=$(echo */ImageLounge)
'';

4
pkgs/applications/graphics/pbrt/default.nix
View File

@ -1,7 +1,6 @@
{stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}:
stdenv.mkDerivation {
version = "2018-08-15";
pname = "pbrt-v3";
@ -18,7 +17,8 @@ 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";

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

@ -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;

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

@ -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";

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

@ -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/";

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

@ -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/";

5
pkgs/applications/graphics/scantailor/default.nix
View File

@ -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/";

5
pkgs/applications/graphics/screencloud/default.nix
View File

@ -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;

5
pkgs/applications/graphics/smartdeblur/default.nix
View File

@ -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" ];

1
pkgs/applications/graphics/solvespace/default.nix
View File

@ -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

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

@ -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" ];

6
pkgs/applications/misc/apvlv/default.nix
View File

@ -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

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

@ -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

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

@ -11,7 +11,8 @@ mkDerivation {
sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY=";
};
buildInputs = [ cmake qtbase qttools file solid ];
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qttools file solid ];
cmakeFlags = [ "-DQT5BUILD=true" ];

2
pkgs/applications/misc/elf-dissector/default.nix
View File

@ -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";

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

@ -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";

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

@ -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";

5
pkgs/applications/misc/keepassx/2.0.nix
View File

@ -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";

6
pkgs/applications/misc/kiwix/default.nix
View File

@ -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

8
pkgs/applications/misc/lenmus/default.nix
View File

@ -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

8
pkgs/applications/misc/opencpn/default.nix
View File

@ -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 ];

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

@ -15,8 +15,6 @@ mkDerivation rec {
sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
buildInputs = [ qtbase qtmultimedia qttranslations SDL ];

6
pkgs/applications/misc/posterazor/default.nix
View File

@ -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

2
pkgs/applications/misc/prusa-slicer/default.nix
View File

@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.2.0";
enableParallelBuilding = true;
nativeBuildInputs = [
cmake
pkgconfig

1
pkgs/applications/misc/pwsafe/default.nix
View File

@ -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.

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

@ -63,8 +63,6 @@ mkDerivation rec {
"-DEXIF_INCLUDE_DIRS=${libexif}/include"
];
enableParallelBuilding = true;
postPatch = ''
substituteInPlace ConfigureChecks.cmake \
--replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt"

2
pkgs/applications/misc/qlandkartegt/garmindev.nix
View File

@ -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";

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

@ -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";

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

@ -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++";

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

@ -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/";

2
pkgs/applications/misc/slade/git.nix
View File

@ -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/";

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

@ -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

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

@ -91,8 +91,6 @@ in stdenv.mkDerivation {
"-DNO_PRINTING=OFF"
];
enableParallelBuilding = true;
passthru = { inherit version libdc googlemaps; };
meta = with stdenv.lib; {

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

@ -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";

1
pkgs/applications/misc/tellico/default.nix
View File

@ -42,7 +42,6 @@ mkDerivation rec {
];
buildInputs = [
cmake
exempi
extra-cmake-modules
karchive

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

@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
pname = "timewarrior";
version = "1.4.2";
enableParallelBuilding = true;
src = fetchFromGitHub {
owner = "GothenburgBitFactory";
repo = "timewarrior";

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

@ -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 ]}"

2
pkgs/applications/networking/browsers/falkon/default.nix
View File

@ -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";

64
pkgs/applications/networking/firehol/default.nix
View File

@ -20,67 +20,17 @@ 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 ];

29
pkgs/applications/networking/firehol/firehol-ping6.patch Normal file
View File

@ -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"],[

5
pkgs/applications/networking/firehol/firehol-sysconfdir.patch Normal file
View File

@ -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"

11
pkgs/applications/networking/firehol/firehol-uname-command.patch Normal file
View File

@ -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

6
pkgs/applications/networking/flent/http-getter.nix
View File

@ -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";

2
pkgs/applications/networking/ids/zeek/default.nix
View File

@ -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 {

3
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
View File

@ -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

1
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -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";

7
pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
View File

@ -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";

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

@ -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:

6
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -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) [

9
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -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;

2
pkgs/applications/networking/owncloud-client/default.nix
View File

@ -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";

2
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
View File

@ -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";

2
pkgs/applications/networking/p2p/ktorrent/default.nix
View File

@ -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/";

2
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -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/";

2
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -92,8 +92,6 @@ in stdenv.mkDerivation {
cp ../wiretap/*.h $dev/include/wiretap
'');
enableParallelBuilding = true;
dontFixCmake = true;
shellHook = ''

2
pkgs/applications/office/gnucash/default.nix
View File

@ -82,8 +82,6 @@ stdenv.mkDerivation rec {
'';
doCheck = false;
enableParallelBuilding = true;
meta = {
description = "Personal and small-business financial-accounting application";

2
pkgs/applications/office/kmymoney/default.nix
View File

@ -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

2
pkgs/applications/office/ledger/default.nix
View File

@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake texinfo ];
enableParallelBuilding = true;
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DBUILD_DOCS:BOOL=ON"

Some files were not shown because too many files have changed in this diff Show More