public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: replace make/build/configure/patchFlags with nix lists

Browse Source
This commit is contained in:
Merijn Broeren
2019-12-30 12:58:11 +01:00
committed by Jan Tojnar
parent 08d5fc3934
commit 133103d709
248 changed files with 336 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/biniou/1.0.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
preBuild = ''
mkdir $out/bin
pkgs/development/ocaml-modules/bolt/default.nix
+1 -1
View File
@@ -45,7 +45,7 @@ EOF
createFindlibDestdir = true;
buildFlags = "all";
buildFlags = [ "all" ];
doCheck = true;
checkTarget = "tests";
pkgs/development/ocaml-modules/camlzip/default.nix
+3 -3
View File
@@ -8,14 +8,14 @@ let
url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz";
sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g";
patches = [];
installTargets = "install-findlib";
installTargets = [ "install-findlib" ];
} else {
version = "1.05";
download_id = "1037";
url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz";
sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b";
patches = [./makefile_1_05.patch];
installTargets = "install";
installTargets = [ "install" ];
};
in
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
--subst-var-by ZLIB_INCLUDE "${zlib.dev}/include"
'';
buildFlags = "all allopt";
buildFlags = [ "all" "allopt" ];
inherit (param) installTargets;
pkgs/development/ocaml-modules/cohttp/0.19.3.nix
+1 -1
View File
@@ -19,7 +19,7 @@ buildOcaml rec {
++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ];
propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ];
buildFlags = "PREFIX=$(out)";
buildFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-cohttp;
pkgs/development/ocaml-modules/cryptokit/default.nix
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ocamlbuild ncurses ];
propagatedBuildInputs = [ param.zarith zlib ];
buildFlags = "setup.data build";
buildFlags = [ "setup.data" "build" ];
preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
pkgs/development/ocaml-modules/dolmen/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ menhir ];
makeFlags = "-C src";
makeFlags = [ "-C" "src" ];
createFindlibDestdir = true;
pkgs/development/ocaml-modules/dypgen/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
make
'';
makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib";
makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/usr/share/man/man1" "DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
meta = {
homepage = http://dypgen.free.fr;
pkgs/development/ocaml-modules/frontc/default.nix
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
})
];
makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)";
makeFlags = [ "PREFIX=$(out)" "OCAML_SITE=$(OCAMLFIND_DESTDIR)" ];
postInstall = "cp ${meta_file} $OCAMLFIND_DESTDIR/FrontC/META";
}
pkgs/development/ocaml-modules/lablgl/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
buildFlags = "lib libopt glut glutopt";
buildFlags = [ "lib" "libopt" "glut" "glutopt" ];
postInstall = ''
cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ];
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
buildFlags = "world";
buildFlags = [ "world" ];
preInstall = ''
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib
pkgs/development/ocaml-modules/lablgtk/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ];
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
buildFlags = "world";
buildFlags = [ "world" ];
preInstall = ''
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib
pkgs/development/ocaml-modules/llvm/default.nix
+2 -2
View File
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
"-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${stdenv.lib.getLib llvm}/lib"
];
buildFlags = "ocaml_all";
buildFlags = [ "ocaml_all" ];
installFlags = "-C bindings/ocaml";
installFlags = [ "-C" "bindings/ocaml" ];
postInstall = ''
mkdir -p $OCAMLFIND_DESTDIR/
pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/
'';
makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo";
makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ];
meta = {
homepage = http://cairographics.org/cairo-ocaml;
pkgs/development/ocaml-modules/ulex/default.nix
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ camlp4 ];
buildFlags = "all all.opt";
buildFlags = [ "all" "all.opt" ];
meta = {
inherit (src.meta) homepage;
pkgs/development/ocaml-modules/yojson/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ let
extra = {
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
preBuild = "mkdir $out/bin";
};