treewide: configureFlags is a flat list

This commit is contained in:
Robin Gloster
2019-11-20 09:21:30 +01:00
committed by Jan Tojnar
parent a534e750a8
commit e9c27ed5f9
5 changed files with 19 additions and 16 deletions

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;