diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/development/ocaml-modules | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules')
5 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix index f8eb80837a3e..7720650ddfc9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ocaml findlib]; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix index 5fcc317d9408..98ab04beb57c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --replace "gcc" "\$(CC)" ''; - configurePhase = "true"; # Skip configure + dontConfigure = true; # Skip configure buildPhase = '' make all allopt diff --git a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix index dba3e2569574..df0bd9133d3c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - configurePhase = "true"; # Skip configure + dontConfigure = true; # Skip configure # De facto, option minimal=1 seems to be the default. See the README. buildPhase = "make ${if minimal then "minimal=1" else ""} build"; installPhase = "make ${if minimal then "minimal=1" else ""} install"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/http/default.nix b/nixpkgs/pkgs/development/ocaml-modules/http/default.nix index b9b530ac599e..4a8b39063361 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/http/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/http/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" ''; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase buildPhase = '' make all opt diff --git a/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix index fb3b67b03b78..6428670ebb2f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase meta = with stdenv.lib; { homepage = https://bitbucket.org/mmottl/pcre-ocaml; |