ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

treewide: configureFlags is a flat list

Browse Source
This commit is contained in:
Robin Gloster 2019-11-20 09:21:30 +01:00 committed by Jan Tojnar
parent a534e750a8
commit e9c27ed5f9
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/common/configure-flags.nix
View File

@ -153,7 +153,7 @@ let
++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
++ (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"
# Platform-specific flags

9
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -170,11 +170,6 @@ stdenv.mkDerivation {
export LD=$CXX
''}
configureFlags+="\
-plugindir $out/$qtPluginPrefix \
-qmldir $out/$qtQmlPrefix \
-docdir $out/$qtDocPrefix"
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
configureFlags =
[
"-plugindir $(out)/$(qtPluginPrefix)"
"-qmldir $(out)/$(qtQmlPrefix)"
"-docdir $(out)/$(qtDocPrefix)"
"-verbose"
"-confirm-license"
"-opensource"

18
pkgs/misc/ghostscript/default.nix
View File

@ -76,15 +76,19 @@ stdenv.mkDerivation rec {
sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac
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 =
[ "--with-system-libtiff"
"--enable-dynamic"
] ++ lib.optional x11Support "--with-x"
++ lib.optional cupsSupport "--enable-cups";
configureFlags = [
"--with-system-libtiff"
"--enable-dynamic"
]
++ 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;

4
pkgs/tools/networking/dhcp/default.nix
View File

@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
"--enable-early-chroot"
"--sysconfdir=/etc"
"--localstatedir=/var"
(lib.optional stdenv.isLinux "--with-randomdev=/dev/random")
] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random"
++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
NIX_CFLAGS_COMPILE = builtins.toString [
"-Wno-error=pointer-compare"

2
pkgs/tools/networking/vde2/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}
);
configureFlags = stdenv.lib.optional (!withPython) [ "--disable-python" ];
configureFlags = stdenv.lib.optional (!withPython) "--disable-python";
buildInputs = [ openssl libpcap ]
++ stdenv.lib.optional withPython python2;