diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-08-03 17:49:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-03 17:49:01 -0400 |
commit | 7a337cde318020a0f91702bfefee85a7b31be06f (patch) | |
tree | c49f254cfc7923c8f60b589449ea0dc11e1fa694 /pkgs/development/compilers | |
parent | 8c784998f64da2d4c388f40a03f6604c8a2e0b45 (diff) | |
parent | 3e034bac1ae1db6ded4eaae0de5153302e683ca5 (diff) | |
download | nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.gz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.bz2 nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.lz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.xz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.zst nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.zip |
Merge pull request #44423 from obsidiansystems/configureFlags-cleanup
treewide: All configureFlags are lists
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/opa/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/opendylan/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/swi-prolog/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/urweb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/yap/default.nix | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 7b9e00b105db..06ed7c51e9ab 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -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 diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index d00080282d7c..17d474359da4 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -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"; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 670a00e250f2..77d943110d17 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - configureFlags = "--with-world --enable-gmp --enable-shared"; + configureFlags = [ + "--with-world" + "--enable-gmp" + "--enable-shared" + ]; buildFlags = "world"; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 8426635ce962..68fa3d3613fd 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -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"; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 7c6b545285cc..3ad0bc25787e 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline gmp zlib ]; - configureFlags = "--enable-tabling=yes"; + configureFlags = [ "--enable-tabling=yes" ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; |