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

treewide: Make more complicated configureFlags lists

Browse Source
This commit is contained in:
John Ericson
2018-07-25 17:44:21 -04:00
parent 632d24f11f
commit 85a9913edd
27 changed files with 193 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

17
pkgs/development/libraries/libinfinity/default.nix
View File

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

13
pkgs/development/libraries/neon/0.29.nix
View File

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

13
pkgs/development/libraries/neon/default.nix
View File

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

14
pkgs/development/libraries/tix/default.nix
View File

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

19
pkgs/development/tools/misc/dialog/default.nix
View File

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