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

Merge branch 'staging-next'

Browse Source
This commit is contained in:
Vladimír Čunát 2018-08-17 20:51:31 +02:00
commit 209730208a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
248 changed files with 1013 additions and 762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/old/cross.txt
View File

@ -64,7 +64,7 @@ stdenv.mkDerivation {
sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np"; sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np";
}; };
inherit noSysDirs; inherit noSysDirs;
configureFlags = "--target=arm-linux"; configureFlags = [ "--target=arm-linux" ];
} }
--- ---

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

@ -179,7 +179,7 @@ let
fi fi
done done
if [ -z "${toString pkgs.stdenv.isCross}" ]; then if [ -z "${toString (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform)}" ]; then
# Make sure that the patchelf'ed binaries still work. # Make sure that the patchelf'ed binaries still work.
echo "testing patched programs..." echo "testing patched programs..."
$out/bin/ash -c 'echo hello world' | grep "hello world" $out/bin/ash -c 'echo hello world' | grep "hello world"

1
nixos/modules/system/boot/systemd.nix
View File

@ -65,6 +65,7 @@ let
"systemd-user-sessions.service" "systemd-user-sessions.service"
"dbus-org.freedesktop.machine1.service" "dbus-org.freedesktop.machine1.service"
"user@.service" "user@.service"
"user-runtime-dir@.service"
# Journal. # Journal.
"systemd-journald.socket" "systemd-journald.socket"

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

@ -13,7 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk2 alsaLib libglade ]; buildInputs = [ intltool gtk2 alsaLib libglade ];
configureFlags = "--disable-jack"; configureFlags = [ "--disable-jack" ];
meta = { meta = {
description = "Not a Guitar-Only tuner"; description = "Not a Guitar-Only tuner";

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

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
pkgconfig libpulseaudio makeWrapper pkgconfig libpulseaudio makeWrapper
]; ];
configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/mhwaveedit \ wrapProgram $out/bin/mhwaveedit \

13
pkgs/applications/audio/puredata/default.nix
View File

@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib libjack2 fftw ]; buildInputs = [ alsaLib libjack2 fftw ];
configureFlags = '' configureFlags = [
--enable-alsa "--enable-alsa"
--enable-jack "--enable-jack"
--enable-fftw "--enable-fftw"
--disable-portaudio "--disable-portaudio"
];
'';
# https://github.com/pure-data/pure-data/issues/188 # https://github.com/pure-data/pure-data/issues/188
# --disable-oss # --disable-oss

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

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
export ac_cv_prog_ac_ct_WINDRES= export ac_cv_prog_ac_ct_WINDRES=
''; '';
configureFlags = "--enable-dependency-tracking"; configureFlags = [ "--enable-dependency-tracking" ];
buildInputs = [ alsaLib python SDL ]; buildInputs = [ alsaLib python SDL ];

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

@ -10,9 +10,11 @@ stdenv.mkDerivation rec {
buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo
libdvdread pkgconfig x264 libmpeg2 xvidcore ]; libdvdread pkgconfig x264 libmpeg2 xvidcore ];
configureFlags = "--disable-ffmpeg --disable-libavcodec --disable-libavformat configureFlags = [
--enable-lzo --enable-ogg --enable-vorbis --enable-theora --enable-libxml2 "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat"
--enable-x264 --enable-libmpeg2 --enable-xvid"; "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2"
"--enable-x264" "--enable-libmpeg2" "--enable-xvid"
];
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
done done
''; '';
configureFlags = "--ioctl=termios"; configureFlags = [ "--ioctl=termios" ];
meta = { meta = {
homepage = http://elvis.vi-editor.org/; homepage = http://elvis.vi-editor.org/;

2
pkgs/applications/editors/emacs-modes/bbdb/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./install-infodir.patch ]; patches = [ ./install-infodir.patch ];
buildInputs = [emacs texinfo ctags]; buildInputs = [emacs texinfo ctags];
configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ];
preInstall = "mkdir -p $out/info"; preInstall = "mkdir -p $out/info";
installTargets = "install-pkg texinfo"; installTargets = "install-pkg texinfo";
postInstall = '' postInstall = ''

2
pkgs/applications/editors/emacs-modes/maude/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [emacs]; buildInputs = [emacs];
configureFlags = "--with-lispdir=$$out/share/emacs/site-lisp"; configureFlags = [ "--with-lispdir=$$out/share/emacs/site-lisp" ];
meta = { meta = {
description = "Emacs mode for the programming language Maude"; description = "Emacs mode for the programming language Maude";

10
pkgs/applications/editors/nano/default.nix
View File

@ -32,11 +32,11 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "info" ]; outputs = [ "out" "info" ];
configureFlags = '' configureFlags = [
--sysconfdir=/etc "--sysconfdir=/etc"
${optionalString (!enableNls) "--disable-nls"} (stdenv.lib.enableFeature enableNls "nls")
${optionalString enableTiny "--enable-tiny"} (stdenv.lib.enableFeature enableTiny "tiny")
''; ];
postInstall = '' postInstall = ''
cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/

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

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
''; '';
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; configureFlags = stdenv.lib.optional withGNOME "--enable-gnome";
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

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

@ -12,7 +12,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; buildInputs = [ wxGTK gtk2 libxml2 freetype pango ];
configureFlags = "--disable-svnversion"; configureFlags = [ "--disable-svnversion" ];
patches = map fetchurl (import ./debian-patches.nix); patches = map fetchurl (import ./debian-patches.nix);

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

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
xorg.libX11 xorg.libXext xorg.libXinerama jansson xorg.libX11 xorg.libXext xorg.libXinerama jansson
]; ];
configureScript = "./autogen.sh"; configureScript = "./autogen.sh";
configureFlags = "--enable-scrypt --enable-opencl"; configureFlags = [ "--enable-scrypt" "--enable-opencl" ];
NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
preConfigure = '' preConfigure = ''

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

@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ openssl ]; buildInputs = [ openssl ];
configureFlags = "--with-ssl=${openssl.dev}"; configureFlags = [ "--with-ssl=${openssl.dev}" ];
meta = { meta = {
homepage = http://www.fetchmail.info/; homepage = http://www.fetchmail.info/;

2
pkgs/applications/misc/font-manager/default.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
''; '';
configureFlags = "--disable-pycompile"; configureFlags = [ "--disable-pycompile" ];
meta = { meta = {
homepage = https://fontmanager.github.io/; homepage = https://fontmanager.github.io/;

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

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop
''; '';
configureFlags = "--disable-nautilus-extension"; configureFlags = [ "--disable-nautilus-extension" ];
meta = { meta = {
description = "A graphical frontend for libgksu"; description = "A graphical frontend for libgksu";

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

@ -19,7 +19,7 @@ stdenv.mkDerivation {
buildInputs = [ db gtk2 bzip2 ]; buildInputs = [ db gtk2 bzip2 ];
configureFlags = "--without-libdb"; configureFlags = [ "--without-libdb" ];
meta = { meta = {
description = "Download utility that can fetch files from several sources simultaneously"; description = "Download utility that can fetch files from several sources simultaneously";

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

@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
preConfigure = "sh autogen.sh"; preConfigure = "sh autogen.sh";
configureFlags = '' configureFlags = [
--enable-nls "--enable-nls"
--enable-safe-mode "--enable-safe-mode"
''; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A fast, lightweight terminal emulator"; description = "A fast, lightweight terminal emulator";

2
pkgs/applications/misc/notify-osd/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
]; ];
configureFlags = "--libexecdir=$(out)/bin"; configureFlags = [ "--libexecdir=$(out)/bin" ];
preFixup = '' preFixup = ''
wrapProgram "$out/bin/notify-osd" \ wrapProgram "$out/bin/notify-osd" \

12
pkgs/applications/misc/taskjuggler/2.x/default.nix
View File

@ -44,12 +44,12 @@ stdenv.mkDerivation rec {
HOME=$TMPDIR HOME=$TMPDIR
''; '';
configureFlags = " configureFlags = [
--without-arts --disable-docs "--without-arts" "--disable-docs"
--x-includes=${libX11.dev}/include "--x-includes=${libX11.dev}/include"
--x-libraries=${libX11.out}/lib "--x-libraries=${libX11.out}/lib"
--with-qt-dir=${qt3} "--with-qt-dir=${qt3}"
"; ];
preInstall = '' preInstall = ''
mkdir -p $out/share/emacs/site-lisp/ mkdir -p $out/share/emacs/site-lisp/

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

@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
''; '';
# Needs the path to `tclConfig.sh' and `tkConfig.sh'. # Needs the path to `tclConfig.sh' and `tkConfig.sh'.
configureFlags = "--with-tcl=" + tcl + "/lib " + configureFlags = [
"--with-tk=" + tk + "/lib"; "--with-tcl=${tcl}/lib"
"--with-tk=${tk}/lib"
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"

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

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ]; [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ];
configureFlags = "--enable-ssl"; configureFlags = [ "--enable-ssl" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.dillo.org/; homepage = https://www.dillo.org/;

6
pkgs/applications/networking/ids/daq/default.nix
View File

@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue];
configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; configureFlags = [
"--enable-nfq-module=yes"
"--with-dnet-includes=${libdnet}/includes"
"--with-dnet-libraries=${libdnet}/lib"
];
meta = { meta = {
description = "Data AcQuisition library (DAQ), for packet I/O"; description = "Data AcQuisition library (DAQ), for packet I/O";

7
pkgs/applications/networking/ids/snort/default.nix
View File

@ -14,7 +14,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib"; configureFlags = [
"--disable-static-daq"
"--enable-control-socket"
"--with-daq-includes=${daq}/includes"
"--with-daq-libraries=${daq}/lib"
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine" wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"

6
pkgs/applications/networking/instant-messengers/amsn/default.nix
View File

@ -7,7 +7,11 @@ stdenv.mkDerivation {
sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r";
}; };
configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; configureFlags = [
"--with-tcl=${tcl}/lib"
"--with-tk=${tk}/lib"
"--enable-static"
];
buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper];

6
pkgs/applications/networking/instant-messengers/mcabber/default.nix
View File

@ -14,7 +14,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ];
configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; configureFlags = [
"--with-openssl=${openssl.dev}"
"--enable-modules"
"--enable-otr"
];
doCheck = true; doCheck = true;

2
pkgs/applications/networking/instant-messengers/silc-client/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
configureFlags = "--with-ncurses=${ncurses.dev}"; configureFlags = [ "--with-ncurses=${ncurses.dev}" ];
preConfigure = stdenv.lib.optionalString enablePlugin '' preConfigure = stdenv.lib.optionalString enablePlugin ''
configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi"

2
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
checkInputs = [ dbus.daemon ]; checkInputs = [ dbus.daemon ];
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;

2
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
dbus telepathy-glib.python dbus telepathy-glib.python
]; ];
configureFlags = "--enable-call"; configureFlags = [ "--enable-call" ];
preFixup = '' preFixup = ''
wrapProgram "$out/libexec/telepathy-logger" \ wrapProgram "$out/libexec/telepathy-logger" \

2
pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libxslt pkgconfigUpstream ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ];
configureFlags = "--disable-avahi-tests"; configureFlags = [ "--disable-avahi-tests" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Link-local XMPP connection manager for Telepathy"; description = "Link-local XMPP connection manager for Telepathy";

5
pkgs/applications/networking/newsreaders/slrn/default.nix
View File

@ -18,7 +18,10 @@ stdenv.mkDerivation {
-e "s|/bin/rm|rm|" -e "s|/bin/rm|rm|"
''; '';
configureFlags = "--with-slang=${slang.dev} --with-ssl=${openssl.dev}"; configureFlags = [
"--with-slang=${slang.dev}"
"--with-ssl=${openssl.dev}"
];
buildInputs = [ slang ncurses openssl ]; buildInputs = [ slang ncurses openssl ];

11
pkgs/applications/networking/znc/default.nix
View File

@ -24,10 +24,13 @@ stdenv.mkDerivation rec {
++ optional withTcl tcl ++ optional withTcl tcl
++ optional withCyrus cyrus_sasl; ++ optional withCyrus cyrus_sasl;
configureFlags = optionalString withPerl "--enable-perl " configureFlags = [
+ optionalString withPython "--enable-python " (stdenv.lib.enableFeature withPerl "perl")
+ optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib " (stdenv.lib.enableFeature withPython "python")
+ optionalString withCyrus "--enable-cyrus "; (stdenv.lib.enableFeature withTcl "tcl")
(stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib")
(stdenv.lib.enableFeature withCyrus "cyrus")
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Advanced IRC bouncer"; description = "Advanced IRC bouncer";

8
pkgs/applications/office/gnucash/2.4.nix
View File

@ -27,7 +27,13 @@ stdenv.mkDerivation rec {
]; ];
propagatedUserEnvPkgs = [ gconf ]; propagatedUserEnvPkgs = [ gconf ];
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; configureFlags = [
"CFLAGS=-O3"
"CXXFLAGS=-O3"
"--disable-dbi"
"--enable-ofx"
"--enable-aqbanking"
];
postInstall = '' postInstall = ''
# Auto-updaters don't make sense in Nix. # Auto-updaters don't make sense in Nix.

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

@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f"; sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f";
}; };
configureFlags = "--disable-component"; configureFlags = [ "--disable-component" ];
prePatch = '' prePatch = ''
substituteInPlace doc/C/gnumeric.xml \ substituteInPlace doc/C/gnumeric.xml \

6
pkgs/applications/office/ledger/2.6.3.nix
View File

@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
buildInputs = [ emacs gmp pcre expat ]; buildInputs = [ emacs gmp pcre expat ];
configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; configureFlags = [
"CPPFLAGS=-DNDEBUG"
"CFLAGS=-O3"
"CXXFLAGS=-O3"
];
doCheck = true; doCheck = true;

7
pkgs/applications/science/biology/ncbi-tools/default.nix
View File

@ -15,7 +15,12 @@ stdenv.mkDerivation rec {
sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr";
}; };
configureFlags = "--without-debug --with-bin-release --with-dll --without-static"; configureFlags = [
"--without-debug"
"--with-bin-release"
"--with-dll"
"--without-static"
];
buildInputs = [ cpio ]; buildInputs = [ cpio ];
meta = { meta = {

16
pkgs/applications/science/chemistry/octopus/default.nix
View File

@ -17,14 +17,14 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ perl procps fftw.dev ]; nativeBuildInputs = [ perl procps fftw.dev ];
buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ]; buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ];
configureFlags = '' configureFlags = [
--with-yaml-prefix=${libyaml} "--with-yaml-prefix=${libyaml}"
--with-blas=-lopenblas "--with-blas=-lopenblas"
--with-lapack=-lopenblas "--with-lapack=-lopenblas"
--with-fftw-prefix=${fftwAll} "--with-fftw-prefix=${fftwAll}"
--with-gsl-prefix=${gsl} "--with-gsl-prefix=${gsl}"
--with-libxc-prefix=${libxc} "--with-libxc-prefix=${libxc}"
''; ];
doCheck = false; doCheck = false;
checkTarget = "check-short"; checkTarget = "check-short";

4
pkgs/applications/science/electronics/geda/default.nix
View File

@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v";
}; };
configureFlags = "--disable-update-xdg-database"; configureFlags = [
"--disable-update-xdg-database"
];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ guile gtk2 flex gawk perl ]; buildInputs = [ guile gtk2 flex gawk perl ];

6
pkgs/applications/science/electronics/xcircuit/default.nix
View File

@ -17,7 +17,11 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook automake pkgconfig ]; nativeBuildInputs = [ autoreconfHook automake pkgconfig ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --with-ngspice=${getBin ngspice}/bin/ngspice"; configureFlags = [
"--with-tcl=${tcl}/lib"
"--with-tk=${tk}/lib"
"--with-ngspice=${getBin ngspice}/bin/ngspice"
];
buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ]; buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ];

5
pkgs/applications/science/logic/eprover/default.nix
View File

@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
sed -e 's/ *CC *= *gcc$//' -i Makefile.vars sed -e 's/ *CC *= *gcc$//' -i Makefile.vars
''; '';
configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man"; configureFlags = [
"--exec-prefix=$(out)"
"--man-prefix=$(out)/share/man"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Automated theorem prover for full first-order logic with equality"; description = "Automated theorem prover for full first-order logic with equality";

2
pkgs/applications/science/logic/hol/default.nix
View File

@ -15,7 +15,7 @@ in
let let
polymlEnableShared = with pkgs; lib.overrideDerivation polyml (attrs: { polymlEnableShared = with pkgs; lib.overrideDerivation polyml (attrs: {
configureFlags = "--enable-shared"; configureFlags = [ "--enable-shared" ];
}); });
in in

2
pkgs/applications/science/math/cbc/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a";
}; };
configureFlags = "-C"; configureFlags = [ "-C" ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/applications/science/math/ginac/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
preConfigure = "patchShebangs ginsh"; preConfigure = "patchShebangs ginsh";
configureFlags = "--disable-rpath"; configureFlags = [ "--disable-rpath" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GiNaC is Not a CAS"; description = "GiNaC is Not a CAS";

52
pkgs/applications/science/math/scilab/default.nix
View File

@ -29,35 +29,29 @@ stdenv.mkDerivation rec {
/* /*
--with-atlas-library=DIR Atlas library files are in DIR and we use Atlas --with-atlas-library=DIR Atlas library files are in DIR and we use Atlas
*/ */
configureFlags = "" configureFlags = [
# use gcc C compiler and gnu Fortran compiler (g77 or gfortran) # use gcc C compiler and gnu Fortran compiler (g77 or gfortran)
+ " --with-gcc --with-g77" "--with-gcc" "--with-g77"
# use Xaw3d widgets given with Scilab # do not compile with PVM library
+ (lib.optionalString (!withXaw3d) " --with-local-xaw") "--without-pvm"
# do not compile with PVM library # compile with GTK
+ " --without-pvm" (stdenv.lib.enableFeature withGtk "gtk")
# compile with GTK (stdenv.lib.enableFeature withGtk "gtk2")
+ (if withGtk then " # compile with ocaml
--with-gtk --with-gtk2 (stdenv.lib.withFeature withOCaml "ocaml")
" else " # do not compile Java interface
--without-gtk --without-gtk2 "--without-java"
") # use the X Window System
# compile with TCL/TK (stdenv.lib.withFeature withX "x")
+ (lib.optionalString withTk " # compile with TCL/TK
--with-tk ] ++ lib.optionals withTk [
--with-tcl-library=${tcl}/lib "--with-tk"
--with-tcl-include=${tcl}/include "--with-tcl-library=${tcl}/lib"
--with-tk-library=${tk}/lib "--with-tcl-include=${tcl}/include"
--with-tk-include=${tk}/include "--with-tk-library=${tk}/lib"
") "--with-tk-include=${tk}/include"
# do not use Gtk widgets ] # use Xaw3d widgets given with Scilab
+ " --without-gtk --without-gtk2" ++ lib.optional (!withXaw3d) "--with-local-xaw"
# compile with ocaml
+ (if withOCaml then " --with-ocaml" else " --without-ocaml")
# do not compile Java interface
+ " --without-java"
# use the X Window System
+ lib.optionalString withX "--with-x"
; ;
makeFlags = "all"; makeFlags = "all";

2
pkgs/applications/science/misc/boinc/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
configureFlags = "--disable-server"; configureFlags = [ "--disable-server" ];
meta = { meta = {
description = "Free software for distributed and grid computing"; description = "Free software for distributed and grid computing";

2
pkgs/applications/version-management/fossil/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
preCheck = stdenv.lib.optional doCheck '' preCheck = stdenv.lib.optional doCheck ''
export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
''; '';
configureFlags = if withJson then "--json" else ""; configureFlags = stdenv.lib.optional withJson "--json";
preBuild='' preBuild=''
export USER=nonexistent-but-specified-user export USER=nonexistent-but-specified-user

24
pkgs/applications/version-management/subversion/default.nix
View File

@ -42,17 +42,19 @@ let
# https://gcc.gnu.org/gcc-5/porting_to.html # https://gcc.gnu.org/gcc-5/porting_to.html
CPPFLAGS = "-P"; CPPFLAGS = "-P";
configureFlags = '' configureFlags = [
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} (stdenv.lib.withFeature bdbSupport "berkeley-db")
${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"} (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} (stdenv.lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} (stdenv.lib.withFeatureAs saslSupport "sasl" sasl)
--disable-keychain (stdenv.lib.withFeatureAs httpSupport "serf" serf)
${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} "--disable-keychain"
${if httpSupport then "--with-serf=${serf}" else "--without-serf"} "--with-zlib=${zlib.dev}"
--with-zlib=${zlib.dev} "--with-sqlite=${sqlite.dev}"
--with-sqlite=${sqlite.dev} ] ++ stdenv.lib.optionals javahlBindings [
''; "--enable-javahl"
"--with-jdk=${jdk}"
];
preBuild = '' preBuild = ''
makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)

2
pkgs/applications/video/kino/default.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation {
buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv
pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages
configureFlags = "--enable-local-ffmpeg=no"; configureFlags = [ "--enable-local-ffmpeg=no" ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

5
pkgs/applications/video/xawtv/default.nix
View File

@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build"
''; '';
configureFlags="--prefix="; configureFlags= [ "--prefix=" ];
NIX_LDFLAGS="-lgcc_s";
NIX_LDFLAGS = "-lgcc_s";
makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX="; makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX=";

2
pkgs/applications/video/xine-ui/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
configureFlags = "--with-readline=${readline.dev}"; configureFlags = [ "--with-readline=${readline.dev}" ];
LIRC_CFLAGS="-I${lirc}/include"; LIRC_CFLAGS="-I${lirc}/include";
LIRC_LIBS="-L ${lirc}/lib -llirc_client"; LIRC_LIBS="-L ${lirc}/lib -llirc_client";

2
pkgs/applications/virtualization/singularity/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
''; '';
configureFlags = "--localstatedir=/var"; configureFlags = [ "--localstatedir=/var" ];
installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy"; installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy";
fixupPhase = '' fixupPhase = ''

4
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -268,8 +268,8 @@ stdenv.mkDerivation {
## ##
mkdir -p $man/nix-support $info/nix-support mkdir -p $man/nix-support $info/nix-support
printWords ${bintools.man or ""} >> $man/nix-support/propagated-build-inputs echo ${bintools.man or ""} >> $man/nix-support/propagated-user-env-packages
printWords ${bintools.info or ""} >> $info/nix-support/propagated-build-inputs echo ${bintools.info or ""} >> $info/nix-support/propagated-user-env-packages
'' ''
+ '' + ''

2
pkgs/data/icons/tango-icon-theme/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ];
configureFlags = "--enable-png-creation"; configureFlags = [ "--enable-png-creation" ];
postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';

2
pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
View File

@ -15,5 +15,5 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ perl perlXMLParser libxml2 libxslt gettext]; buildInputs = [ perl perlXMLParser libxml2 libxslt gettext];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml"; configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ];
} }

6
pkgs/desktops/gnome-2/desktop/vte/default.nix
View File

@ -32,9 +32,9 @@ in stdenv.mkDerivation rec {
buildInputs = [ intltool glib gtk ncurses ] ++ buildInputs = [ intltool glib gtk ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk]; stdenv.lib.optionals pythonSupport [python pygtk];
configureFlags = '' configureFlags = [
${if pythonSupport then "--enable-python" else "--disable-python"} (stdenv.lib.enableFeature pythonSupport "python")
''; ];
postInstall = stdenv.lib.optionalString pythonSupport '' postInstall = stdenv.lib.optionalString pythonSupport ''
cd $(toPythonPath $out)/gtk-2.0 cd $(toPythonPath $out)/gtk-2.0

2
pkgs/desktops/gnome-3/core/folks/default.nix
View File

@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
vala libsecret libxml2 libsoup nspr nss intltool db ]; vala libsecret libxml2 libsoup nspr nss intltool db ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
configureFlags = "--disable-fatal-warnings"; configureFlags = [ "--disable-fatal-warnings" ];
NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss"
"-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"]; "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"];

2
pkgs/desktops/gnome-3/core/rest/default.nix
View File

@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libsoup gobjectIntrospection]; buildInputs = [ glib libsoup gobjectIntrospection];
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

2
pkgs/desktops/mate/mate-control-center/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
mate.mate-settings-daemon mate.mate-settings-daemon
]; ];
configureFlags = "--disable-update-mimedb"; configureFlags = [ "--disable-update-mimedb" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Utilities to configure the MATE desktop"; description = "Utilities to configure the MATE desktop";

2
pkgs/desktops/mate/mate-screensaver/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
mate.mate-menus mate.mate-menus
]; ];
configureFlags = "--without-console-kit"; configureFlags = [ "--without-console-kit" ];
makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc"; makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc";

2
pkgs/desktops/mate/mate-system-monitor/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
systemd systemd
]; ];
configureFlags = "--enable-systemd"; configureFlags = [ "--enable-systemd" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "System monitor for the MATE desktop"; description = "System monitor for the MATE desktop";

2
pkgs/development/compilers/opa/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind "; configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ];
buildInputs = [ which perl jdk openssl coreutils zlib ncurses buildInputs = [ which perl jdk openssl coreutils zlib ncurses
makeWrapper gcc binutils gnumake nodejs makeWrapper gcc binutils gnumake nodejs

4
pkgs/development/compilers/opendylan/default.nix
View File

@ -24,7 +24,9 @@ stdenv.mkDerivation {
./autogen.sh ./autogen.sh
''; '';
configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}"; configureFlags = [
(if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}")
];
buildPhase = "make 3-stage-bootstrap"; buildPhase = "make 3-stage-bootstrap";
postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";

6
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -21,7 +21,11 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
configureFlags = "--with-world --enable-gmp --enable-shared"; configureFlags = [
"--with-world"
"--enable-gmp"
"--enable-shared"
];
buildFlags = "world"; buildFlags = "world";

2
pkgs/development/compilers/urweb/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
''; '';
configureFlags = "--with-openssl=${openssl.dev}"; configureFlags = [ "--with-openssl=${openssl.dev}" ];
preConfigure = '' preConfigure = ''
export PGHEADER="${postgresql}/include/libpq-fe.h"; export PGHEADER="${postgresql}/include/libpq-fe.h";

2
pkgs/development/compilers/yap/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ readline gmp zlib ]; buildInputs = [ readline gmp zlib ];
configureFlags = "--enable-tabling=yes"; configureFlags = [ "--enable-tabling=yes" ];
NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ];

2
pkgs/development/coq-modules/coquelicot/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildInputs = [ coq ]; buildInputs = [ coq ];
propagatedBuildInputs = [ ssreflect ]; propagatedBuildInputs = [ ssreflect ];
configureFlags = "--libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Coquelicot"; configureFlags = [ "--libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Coquelicot" ];
buildPhase = "./remake"; buildPhase = "./remake";
installPhase = "./remake install"; installPhase = "./remake install";

16
pkgs/development/interpreters/clisp/default.nix
View File

@ -67,15 +67,15 @@ stdenv.mkDerivation rec {
substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
''; '';
configureFlags = "builddir" configureFlags = [ "builddir" ]
+ stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules" ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
+ stdenv.lib.optionalString (readline != null) " --with-readline" ++ stdenv.lib.optional (readline != null) "--with-readline"
# --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
+ stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi" ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
+ stdenv.lib.optionalString ffcallAvailable " --with-ffcall" ++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
+ stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall" ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
+ stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules ++ builtins.map (x: "--with-module=" + x) withModules
+ stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS"; ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
preBuild = '' preBuild = ''
sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d

16
pkgs/development/interpreters/clisp/hg.nix
View File

@ -62,15 +62,15 @@ stdenv.mkDerivation rec {
substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
''; '';
configureFlags = "builddir" configureFlags = [ "builddir" ]
+ stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules" ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
+ stdenv.lib.optionalString (readline != null) " --with-readline" ++ stdenv.lib.optional (readline != null) "--with-readline"
# --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
+ stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi" ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
+ stdenv.lib.optionalString ffcallAvailable " --with-ffcall" ++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
+ stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall" ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
+ stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules ++ builtins.map (x: " --with-module=" + x) withModules
+ stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS"; ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
preBuild = '' preBuild = ''
sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d

2
pkgs/development/interpreters/scsh/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ scheme48 ]; buildInputs = [ scheme48 ];
configureFlags = ''--with-scheme48=${scheme48}''; configureFlags = [ "--with-scheme48=${scheme48}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Scheme shell"; description = "A Scheme shell";

2
pkgs/development/libraries/aalib/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation {
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
configureFlags = "--without-x --with-ncurses=${ncurses.dev}"; configureFlags = [ "--without-x" "--with-ncurses=${ncurses.dev}" ];
postInstall = '' postInstall = ''
mkdir -p $dev/bin mkdir -p $dev/bin

2
pkgs/development/libraries/agg/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sh autogen.sh sh autogen.sh
''; '';
configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --enable-examples=no"; configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" "--enable-examples=no" ];
# libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o
# libtool: error: cannot find the library 'libexamples.la' # libtool: error: cannot find the library 'libexamples.la'

4
pkgs/development/libraries/arb/git.nix
View File

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
rev = "10bc615ce5999caf4723444b2b1219b74781d8a4"; rev = "10bc615ce5999caf4723444b2b1219b74781d8a4";
sha256 = "1xb40x3hv9nh76aizhskj5gdhalgn7r95a7zji2nn4ih3lmh40hl"; sha256 = "1xb40x3hv9nh76aizhskj5gdhalgn7r95a7zji2nn4ih3lmh40hl";
}; };
buildInputs = [mpir gmp mpfr flint]; buildInputs = [ mpir gmp mpfr flint ];
configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}"; configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ];
meta = { meta = {
inherit version; inherit version;
description = ''A library for arbitrary-precision interval arithmetic''; description = ''A library for arbitrary-precision interval arithmetic'';

4
pkgs/development/libraries/beecrypt/default.nix
View File

@ -6,8 +6,8 @@ stdenv.mkDerivation {
url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz; url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz;
sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8";
}; };
buildInputs = [m4]; buildInputs = [ m4 ];
configureFlags = "--disable-optimized --enable-static"; configureFlags = [ "--disable-optimized" "--enable-static" ];
meta = { meta = {
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;

2
pkgs/development/libraries/buddy/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ bison ]; buildInputs = [ bison ];
patches = [ ./gcc-4.3.3-fixes.patch ]; patches = [ ./gcc-4.3.3-fixes.patch ];
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3"; configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ];
doCheck = true; doCheck = true;
meta = { meta = {

6
pkgs/development/libraries/classads/default.nix
View File

@ -12,9 +12,9 @@ stdenv.mkDerivation {
buildInputs = [ pcre ]; buildInputs = [ pcre ];
configureFlags = '' configureFlags = [
--enable-namespace --enable-flexible-member "--enable-namespace" "--enable-flexible-member"
''; ];
meta = { meta = {
homepage = http://www.cs.wisc.edu/condor/classad/; homepage = http://www.cs.wisc.edu/condor/classad/;

9
pkgs/development/libraries/clearsilver/default.nix
View File

@ -10,7 +10,14 @@ stdenv.mkDerivation rec {
PYTHON_SITE = "$(out)/site-packages"; PYTHON_SITE = "$(out)/site-packages";
configureFlags = "--with-python=${python}/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp"; configureFlags = [
"--with-python=${python}/bin/python"
"--disable-apache"
"--disable-perl"
"--disable-ruby"
"--disable-java"
"--disable-csharp"
];
preInstall = '' preInstall = ''
mkdir -p $out mkdir -p $out

2
pkgs/development/libraries/cloog-ppl/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./fix-ppl-version.patch ]; patches = [ ./fix-ppl-version.patch ];
configureFlags = "--with-ppl=${ppl}"; configureFlags = [ "--with-ppl=${ppl}" ];
preAutoreconf = '' preAutoreconf = ''
touch NEWS ChangeLog AUTHORS touch NEWS ChangeLog AUTHORS

2
pkgs/development/libraries/cwiid/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
configureFlags = "--without-python"; configureFlags = [ "--without-python" ];
prePatch = '' prePatch = ''
sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in

2
pkgs/development/libraries/dbus-cplusplus/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus glib expat ]; buildInputs = [ dbus glib expat ];
configureFlags = "--disable-ecore"; configureFlags = [ "--disable-ecore" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://dbus-cplusplus.sourceforge.net; homepage = http://dbus-cplusplus.sourceforge.net;

4
pkgs/development/libraries/dbus/default.nix
View File

@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
&& libSM != null; && libSM != null;
let let
version = "1.12.8"; version = "1.12.10";
sha256 = "1cvfi7jiby12h0f5gbysphhk99m6mch87ab3cqxkj0w36gkrkp72"; sha256 = "1xywijmgfad4m3cxp0b4l6kvypwc53ckmhwwzbrc6n32jwj3ssab";
self = stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "dbus-${version}"; name = "dbus-${version}";

6
pkgs/development/libraries/fflas-ffpack/1.nix
View File

@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ givaro_3_7 openblas gmpxx]; buildInputs = [ givaro_3_7 openblas gmpxx];
configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; configureFlags = [
"--with-blas=-lopenblas"
"--with-gmp=${gmpxx.dev}"
"--with-givaro=${givaro_3_7}"
];
meta = { meta = {
inherit version; inherit version;
description = ''Finite Field Linear Algebra Subroutines''; description = ''Finite Field Linear Algebra Subroutines'';

6
pkgs/development/libraries/fribidi/default.nix
View File

@ -11,14 +11,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "fribidi"; pname = "fribidi";
version = "1.0.4"; version = "1.0.5";
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];
# NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
src = fetchurl { src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl"; sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a";
}; };
postPatch = '' postPatch = ''

6
pkgs/development/libraries/gamin/default.nix
View File

@ -14,7 +14,11 @@ stdenv.mkDerivation (rec {
# `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
# <sys/socket.h> with Glibc 2.9. # <sys/socket.h> with Glibc 2.9.
configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; configureFlags = [
"--disable-debug"
"--with-python=${python}"
"CPPFLAGS=-D_GNU_SOURCE"
];
patches = [ ./deadlock.patch ] patches = [ ./deadlock.patch ]
++ map fetchurl (import ./debian-patches.nix) ++ map fetchurl (import ./debian-patches.nix)

6
pkgs/development/libraries/gdbm/default.nix
View File

@ -1,11 +1,13 @@
{ stdenv, lib, buildPlatform, fetchurl }: { stdenv, lib, buildPlatform, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gdbm-1.15"; name = "gdbm-1.17";
# FIXME: remove on update to > 1.17
NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null;
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gdbm/${name}.tar.gz"; url = "mirror://gnu/gdbm/${name}.tar.gz";
sha256 = "03nwsbixdp3nx3fzn3gjy0n7rcppmkkxb2nxbmd8mvb7gwhf7zgr"; sha256 = "0zcp2iv5dbab18859a5fvacg8lkp8k4pr9af13kfvami6lpcrn3w";
}; };
doCheck = true; # not cross; doCheck = true; # not cross;

2
pkgs/development/libraries/gegl/3.0.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
# needs fonts otherwise don't know how to pass them # needs fonts otherwise don't know how to pass them
configureFlags = "--disable-docs"; configureFlags = [ "--disable-docs" ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/development/libraries/gegl/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
})]; })];
# needs fonts otherwise don't know how to pass them # needs fonts otherwise don't know how to pass them
configureFlags = "--disable-docs"; configureFlags = [ "--disable-docs" ];
buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
++ stdenv.lib.optional stdenv.isDarwin OpenGL; ++ stdenv.lib.optional stdenv.isDarwin OpenGL;

8
pkgs/development/libraries/gmp/4.3.2.nix
View File

@ -27,8 +27,12 @@ let self = stdenv.mkDerivation rec {
then "ln -sf configfsf.guess config.guess" then "ln -sf configfsf.guess config.guess"
else ''echo "Darwin host is `./config.guess`."''; else ''echo "Darwin host is `./config.guess`."'';
configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") + configureFlags = [
stdenv.lib.optionalString stdenv.isDarwin " ac_cv_build=x86_64-apple-darwin13.4.0 ac_cv_host=x86_64-apple-darwin13.4.0"; (stdenv.lib.enableFeature cxx "cxx")
] ++ stdenv.lib.optionals stdenv.isDarwin [
"ac_cv_build=x86_64-apple-darwin13.4.0"
"ac_cv_host=x86_64-apple-darwin13.4.0"
];
# The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8. # The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8.
# Newer versions of GMP don't have that issue anymore. # Newer versions of GMP don't have that issue anymore.

13
pkgs/development/libraries/gmp/5.1.x.nix
View File

@ -20,18 +20,17 @@ let self = stdenv.mkDerivation rec {
patches = if stdenv.isDarwin then [ ./need-size-t.patch ] else null; patches = if stdenv.isDarwin then [ ./need-size-t.patch ] else null;
configureFlags = configureFlags = [
"--with-pic"
(stdenv.lib.enableFeature cxx "cxx")
# Build a "fat binary", with routines for several sub-architectures # Build a "fat binary", with routines for several sub-architectures
# (x86), except on Solaris where some tests crash with "Memory fault". # (x86), except on Solaris where some tests crash with "Memory fault".
# See <http://hydra.nixos.org/build/2760931>, for instance. # See <http://hydra.nixos.org/build/2760931>, for instance.
# #
# no darwin because gmp uses ASM that clang doesn't like # no darwin because gmp uses ASM that clang doesn't like
optional (!stdenv.isSunOS) "--enable-fat" (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
++ (if cxx then [ "--enable-cxx" ] ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
else [ "--disable-cxx" ]) ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
++ optional stdenv.isDarwin "ABI=64"
++ optional stdenv.is64bit "--with-pic"
; ;
# The config.guess in GMP tries to runtime-detect various # The config.guess in GMP tries to runtime-detect various

11
pkgs/development/libraries/gmp/6.x.nix
View File

@ -21,18 +21,17 @@ let self = stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ m4 ]; nativeBuildInputs = [ m4 ];
configureFlags = configureFlags = [
"--with-pic"
(stdenv.lib.enableFeature cxx "cxx")
# Build a "fat binary", with routines for several sub-architectures # Build a "fat binary", with routines for several sub-architectures
# (x86), except on Solaris where some tests crash with "Memory fault". # (x86), except on Solaris where some tests crash with "Memory fault".
# See <http://hydra.nixos.org/build/2760931>, for instance. # See <http://hydra.nixos.org/build/2760931>, for instance.
# #
# no darwin because gmp uses ASM that clang doesn't like # no darwin because gmp uses ASM that clang doesn't like
optional (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "--enable-fat" (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
++ (if cxx then [ "--enable-cxx" ] ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
else [ "--disable-cxx" ])
++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
++ optional stdenv.is64bit "--with-pic"
++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
; ;

2
pkgs/development/libraries/gsasl/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libidn kerberos ]; buildInputs = [ libidn kerberos ];
configureFlags = "--with-gssapi-impl=mit"; configureFlags = [ "--with-gssapi-impl=mit" ];
doCheck = true; doCheck = true;

2
pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# Upstream strongly recommends against using --with-system-ffmpeg, # Upstream strongly recommends against using --with-system-ffmpeg,
# but we do it anyway because we're so hardcore (and we don't want # but we do it anyway because we're so hardcore (and we don't want
# multiple copies of ffmpeg). # multiple copies of ffmpeg).
configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; configureFlags = stdenv.lib.optional (!useInternalFfmpeg) "--with-system-ffmpeg";
buildInputs = buildInputs =
[ pkgconfig bzip2 gst-plugins-base orc ] [ pkgconfig bzip2 gst-plugins-base orc ]

10
pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
View File

@ -26,9 +26,13 @@ stdenv.mkDerivation rec {
patch -p1 < ${./darwin.patch} patch -p1 < ${./darwin.patch}
''; '';
configureFlags = '' configureFlags = [
--disable-examples --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook "--disable-examples"
''; "--enable-failing-tests"
"--localstatedir=/var"
"--disable-gtk-doc"
"--disable-docbook"
];
postInstall = '' postInstall = ''
# Hm, apparently --disable-gtk-doc is ignored... # Hm, apparently --disable-gtk-doc is ignored...

6
pkgs/development/libraries/icu/base.nix
View File

@ -36,9 +36,9 @@ let
sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
''; '';
configureFlags = "--disable-debug" + configureFlags = [ "--disable-debug" ]
stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath" + ++ stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath"
stdenv.lib.optionalString (buildPlatform != hostPlatform) " --with-cross-build=${nativeBuildRoot}"; ++ stdenv.lib.optional (buildPlatform != hostPlatform) "--with-cross-build=${nativeBuildRoot}";
enableParallelBuilding = true; enableParallelBuilding = true;

9
pkgs/development/libraries/ilixi/default.nix
View File

@ -14,9 +14,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; buildInputs = [ directfb libsigcxx libxml2 fontconfig ];
configureFlags = '' configureFlags = [
--enable-log-debug --enable-debug --enable-trace --with-examples "--enable-log-debug"
''; "--enable-debug"
"--enable-trace"
"--with-examples"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lightweight C++ GUI toolkit for embedded Linux systems"; description = "Lightweight C++ GUI toolkit for embedded Linux systems";

9
pkgs/development/libraries/imlib/default.nix
View File

@ -7,10 +7,11 @@ stdenv.mkDerivation {
sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3";
}; };
configureFlags = " configureFlags = [
--disable-shm "--disable-shm"
--x-includes=${libX11.dev}/include "--x-includes=${libX11.dev}/include"
--x-libraries=${libX11.out}/lib"; "--x-libraries=${libX11.out}/lib"
];
buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];

2
pkgs/development/libraries/jasper/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ libjpeg ]; propagatedBuildInputs = [ libjpeg ];
configureFlags = "--enable-shared"; configureFlags = [ "--enable-shared" ];
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];

2
pkgs/development/libraries/lensfun/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib zlib libpng cmake gnumake3 ]; buildInputs = [ glib zlib libpng cmake gnumake3 ];
configureFlags = "-v"; configureFlags = [ "-v" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;

2
pkgs/development/libraries/libagar/libagar_test.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
cat configure.in | ${bsdbuild}/bin/mkconfigure > configure cat configure.in | ${bsdbuild}/bin/mkconfigure > configure
''; '';
configureFlags = "--with-agar=${libagar}"; configureFlags = [ "--with-agar=${libagar}" ];
buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ];

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