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

camlp4: 4.02.0+1 -> 4.02+6 

* Remove unneeded substitution in postConfigure
   This was fixed here: 81ed5cf2e8

 * camlp4: use fetchzip

It is considered more reliable than fetchurl
This commit is contained in:
Samuel Rivas 2015-07-28 17:30:40 +02:00 committed by Samuel Rivas
parent 9d5508d85c
commit d516f12dba
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/ocaml/camlp4/default.nix
View File

@ -1,15 +1,17 @@
{stdenv, fetchurl, which, ocaml}: {stdenv, fetchzip, which, ocaml}:
let let
ocaml_version = (stdenv.lib.getVersion ocaml); ocaml_version = (stdenv.lib.getVersion ocaml);
version = "4.02+6";
in in
assert stdenv.lib.versionAtLeast ocaml_version "4.02"; assert stdenv.lib.versionAtLeast ocaml_version "4.02";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "camlp4-4.02.0+1"; name = "camlp4-${version}";
src = fetchurl { src = fetchzip {
url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz; url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz";
sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn"; sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj";
}; };
buildInputs = [ which ocaml ]; buildInputs = [ which ocaml ];
@ -27,10 +29,6 @@ stdenv.mkDerivation {
postConfigure = '' postConfigure = ''
substituteInPlace camlp4/META.in \ substituteInPlace camlp4/META.in \
--replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4
substituteInPlace camlp4/config/Camlp4_config.ml \
--replace \
"Filename.concat ocaml_standard_library" \
"Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\""
''; '';