treewide: Make configureFlags lists

This commit is contained in:
John Ericson
2018-08-03 17:06:03 -04:00
parent 85a9913edd
commit db965063b3
164 changed files with 380 additions and 263 deletions
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
disableIda = "--disable-ida --disable-fsi-benchmark";
configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config";
configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm_38}/bin/llvm-config" ];
BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ocamlbuild ounit ];
configureFlags = "--enable-tests";
configureFlags = [ "--enable-tests" ];
doCheck = true;
checkTarget = "test";
@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib";
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
buildFlags = "world";
preInstall = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib";
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
buildFlags = "world";
preInstall = ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]
++ (param.buildInputs or []);
configureFlags = "--root $(out) --prefix /";
configureFlags = [ "--root $(out) --prefix /" ];
dontAddPrefix = true;
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ocamlbuild ounit ];
configureFlags = "--enable-tests";
configureFlags = [ "--enable-tests" ];
doCheck = true;
checkPhase = "ocaml setup.ml -test";