diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-25 17:44:21 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-03 17:06:03 -0400 |
commit | 85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e (patch) | |
tree | 544a86c87280e6870fefe3005d2b9387a6b48581 /pkgs/development | |
parent | 632d24f11f51cc1581e921aa0eb8c6669296e8de (diff) |
treewide: Make more complicated configureFlags lists
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/scsh/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/classads/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/ilixi/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/libinfinity/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/neon/0.29.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/neon/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/tix/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/tools/misc/dialog/default.nix | 19 |
9 files changed, 52 insertions, 51 deletions
diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 8da41ea1a9cb5..85c9434f08138 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ scheme48 ]; - configureFlags = ''--with-scheme48=${scheme48}''; + configureFlags = [ "--with-scheme48=${scheme48}" ]; meta = with stdenv.lib; { description = "A Scheme shell"; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 32a4a574ed6ca..d329b1945fc74 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation { buildInputs = [ pcre ]; - configureFlags = '' - --enable-namespace --enable-flexible-member - ''; + configureFlags = [ + "--enable-namespace" "--enable-flexible-member" + ]; meta = { homepage = http://www.cs.wisc.edu/condor/classad/; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index e46ecfb761270..9f1048f2de56d 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -26,9 +26,13 @@ stdenv.mkDerivation rec { patch -p1 < ${./darwin.patch} ''; - configureFlags = '' - --disable-examples --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook - ''; + configureFlags = [ + "--disable-examples" + "--enable-failing-tests" + "--localstatedir=/var" + "--disable-gtk-doc" + "--disable-docbook" + ]; postInstall = '' # Hm, apparently --disable-gtk-doc is ignored... diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 0213148d69300..99f6df9c5f065 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; - configureFlags = '' - --enable-log-debug --enable-debug --enable-trace --with-examples - ''; + configureFlags = [ + "--enable-log-debug" + "--enable-debug" + "--enable-trace" + "--with-examples" + ]; meta = with stdenv.lib; { description = "Lightweight C++ GUI toolkit for embedded Linux systems"; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 208e011106255..dffb9053605d0 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -7,7 +7,6 @@ , libintl }: let - edf = flag: feature: (if flag then "--with-" else "--without-") + feature; optional = cond: elem: assert cond -> elem != null; if cond then [elem] else []; in stdenv.mkDerivation rec { @@ -28,14 +27,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gnutls ]; - configureFlags = '' - ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} - ${edf gtkWidgets "inftextgtk"} - ${edf gtkWidgets "infgtk"} - ${edf daemon "infinoted"} - ${edf daemon "libdaemon"} - ${edf avahiSupport "avahi"} - ''; + configureFlags = [ + (stdenv.lib.enableFeature documentation "gtk-doc") + (stdenv.lib.withFeature gtkWidgets "inftextgtk") + (stdenv.lib.withFeature gtkWidgets "infgtk") + (stdenv.lib.withFeature daemon "infinoted") + (stdenv.lib.withFeature daemon "libdaemon") + (stdenv.lib.withFeature avahiSupport "avahi") + ]; passthru = { inherit version; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index dbde83c2d94ba..d0f992efb2bca 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -28,13 +28,12 @@ stdenv.mkDerivation rec { buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; - configureFlags = '' - ${if shared then "--enable-shared" else "--disable-shared"} - ${if static then "--enable-static" else "--disable-static"} - ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl" else "--without-ssl"} - --enable-shared - ''; + configureFlags = [ + (stdenv.lib.enableFeature shared "shared") + (stdenv.lib.enableFeature static "static") + (stdenv.lib.withFeature compressionSupport "zlib") + (stdenv.lib.withFeature sslSupport "ssl") + ]; passthru = {inherit compressionSupport sslSupport;}; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 9c2a3265491a5..7aad5be36f705 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -28,13 +28,12 @@ stdenv.mkDerivation rec { buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; - configureFlags = '' - ${if shared then "--enable-shared" else "--disable-shared"} - ${if static then "--enable-static" else "--disable-static"} - ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl" else "--without-ssl"} - --enable-shared - ''; + configureFlags = [ + (stdenv.lib.enableFeature shared "shared") + (stdenv.lib.enableFeature static "static") + (stdenv.lib.withFeature compressionSupport "zlib") + (stdenv.lib.withFeature sslSupport "ssl") + ]; passthru = {inherit compressionSupport sslSupport;}; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 7e18e7402273f..232c95e6257e2 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { ln -s $i private_headers/generic; done; ''; - configureFlags = '' - --with-tclinclude=${tcl}/include - --with-tclconfig=. - --with-tkinclude=${tk.dev}/include - --with-tkconfig=. - --libdir=''${prefix}/lib - ''; + configureFlags = [ + "--with-tclinclude=${tcl}/include" + "--with-tclconfig=." + "--with-tkinclude=${tk.dev}/include" + "--with-tkconfig=." + "--libdir=\${prefix}/lib" + ]; meta = with stdenv.lib; { description = "A widget library for Tcl/Tk"; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 591254c73f578..a433c4a338cd1 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -1,12 +1,9 @@ { stdenv, fetchurl, ncurses , withLibrary ? false, libtool , unicodeSupport ? true +, enableShared ? !stdenv.isDarwin }: -let optStr = stdenv.lib.optionalString; - buildShared = !stdenv.isDarwin; -in - assert withLibrary -> libtool != null; assert unicodeSupport -> ncurses.unicode && ncurses != null; @@ -24,14 +21,14 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - configureFlags = '' - --disable-rpath-hacks - ${optStr withLibrary "--with-libtool"} - --with-libtool-opts=${optStr buildShared "-shared"} - --with-ncurses${optStr unicodeSupport "w"} - ''; + configureFlags = [ + "--disable-rpath-hacks" + (stdenv.lib.withFeature withLibrary "libtool") + "--with-ncurses${stdenv.lib.optionalString unicodeSupport "w"}" + "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}" + ]; - installTargets = "install${optStr withLibrary "-full"}"; + installTargets = "install${stdenv.lib.optionalString withLibrary "-full"}"; meta = { homepage = http://invisible-island.net/dialog/dialog.html; |