Merge pull request #44423 from obsidiansystems/configureFlags-cleanup
treewide: All configureFlags are lists
This commit is contained in:
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
configureFlags = "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind ";
|
||||
configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ];
|
||||
|
||||
buildInputs = [ which perl jdk openssl coreutils zlib ncurses
|
||||
makeWrapper gcc binutils gnumake nodejs
|
||||
|
||||
@@ -24,7 +24,9 @@ stdenv.mkDerivation {
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}";
|
||||
configureFlags = [
|
||||
(if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}")
|
||||
];
|
||||
buildPhase = "make 3-stage-bootstrap";
|
||||
|
||||
postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";
|
||||
|
||||
@@ -20,7 +20,11 @@ stdenv.mkDerivation {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = "--with-world --enable-gmp --enable-shared";
|
||||
configureFlags = [
|
||||
"--with-world"
|
||||
"--enable-gmp"
|
||||
"--enable-shared"
|
||||
];
|
||||
|
||||
buildFlags = "world";
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
|
||||
'';
|
||||
|
||||
configureFlags = "--with-openssl=${openssl.dev}";
|
||||
configureFlags = [ "--with-openssl=${openssl.dev}" ];
|
||||
|
||||
preConfigure = ''
|
||||
export PGHEADER="${postgresql}/include/libpq-fe.h";
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ readline gmp zlib ];
|
||||
|
||||
configureFlags = "--enable-tabling=yes";
|
||||
configureFlags = [ "--enable-tabling=yes" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user