treewide: configureFlags is a flat list
This commit is contained in:
parent
a534e750a8
commit
e9c27ed5f9
@ -153,7 +153,7 @@ let
|
|||||||
++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
|
++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
|
||||||
|
|
||||||
++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; })
|
++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; })
|
||||||
++ lib.optional (targetPlatform != hostPlatform) crossConfigureFlags
|
++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags
|
||||||
++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap"
|
++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap"
|
||||||
|
|
||||||
# Platform-specific flags
|
# Platform-specific flags
|
||||||
|
@ -170,11 +170,6 @@ stdenv.mkDerivation {
|
|||||||
export LD=$CXX
|
export LD=$CXX
|
||||||
''}
|
''}
|
||||||
|
|
||||||
configureFlags+="\
|
|
||||||
-plugindir $out/$qtPluginPrefix \
|
|
||||||
-qmldir $out/$qtQmlPrefix \
|
|
||||||
-docdir $out/$qtDocPrefix"
|
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
|
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@ -222,6 +217,10 @@ stdenv.mkDerivation {
|
|||||||
# TODO Remove obsolete and useless flags once the build will be totally mastered
|
# TODO Remove obsolete and useless flags once the build will be totally mastered
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[
|
[
|
||||||
|
"-plugindir $(out)/$(qtPluginPrefix)"
|
||||||
|
"-qmldir $(out)/$(qtQmlPrefix)"
|
||||||
|
"-docdir $(out)/$(qtDocPrefix)"
|
||||||
|
|
||||||
"-verbose"
|
"-verbose"
|
||||||
"-confirm-license"
|
"-confirm-license"
|
||||||
"-opensource"
|
"-opensource"
|
||||||
|
@ -76,15 +76,19 @@ stdenv.mkDerivation rec {
|
|||||||
sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac
|
sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac
|
||||||
|
|
||||||
autoconf
|
autoconf
|
||||||
'' + lib.optionalString cupsSupport ''
|
|
||||||
configureFlags="$configureFlags --with-cups-serverbin=$out/lib/cups --with-cups-serverroot=$out/etc/cups --with-cups-datadir=$out/share/cups"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags =
|
configureFlags = [
|
||||||
[ "--with-system-libtiff"
|
"--with-system-libtiff"
|
||||||
"--enable-dynamic"
|
"--enable-dynamic"
|
||||||
] ++ lib.optional x11Support "--with-x"
|
]
|
||||||
++ lib.optional cupsSupport "--enable-cups";
|
++ lib.optional x11Support "--with-x"
|
||||||
|
++ lib.optionals cupsSupport [
|
||||||
|
"--enable-cups"
|
||||||
|
"--with-cups-serverbin=$(out)/lib/cups"
|
||||||
|
"--with-cups-serverroot=$(out)/etc/cups"
|
||||||
|
"--with-cups-datadir=$(out)/share/cups"
|
||||||
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
|
|||||||
"--enable-early-chroot"
|
"--enable-early-chroot"
|
||||||
"--sysconfdir=/etc"
|
"--sysconfdir=/etc"
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
(lib.optional stdenv.isLinux "--with-randomdev=/dev/random")
|
] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random"
|
||||||
] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
|
++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = builtins.toString [
|
NIX_CFLAGS_COMPILE = builtins.toString [
|
||||||
"-Wno-error=pointer-compare"
|
"-Wno-error=pointer-compare"
|
||||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
configureFlags = stdenv.lib.optional (!withPython) [ "--disable-python" ];
|
configureFlags = stdenv.lib.optional (!withPython) "--disable-python";
|
||||||
|
|
||||||
buildInputs = [ openssl libpcap ]
|
buildInputs = [ openssl libpcap ]
|
||||||
++ stdenv.lib.optional withPython python2;
|
++ stdenv.lib.optional withPython python2;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user