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

Merge pull request #41591 from vbgl/opaline

Browse Source 
ocamlPackages: use opaline instead of opam-installer
This commit is contained in:
xeji
2018-06-09 01:34:02 +02:00
committed by GitHub
parent fc643ef950 07d40825d8
commit af5b858825
16 changed files with 47 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/findlib/default.nix
+2 -2
View File
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then
export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
fi
if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"
if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"
fi
export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
if test -n "$createFindlibDestdir"; then
pkgs/development/tools/ocaml/jbuilder/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, opam }:
{ stdenv, fetchFromGitHub, ocamlPackages, opaline }:
stdenv.mkDerivation rec {
name = "jbuilder-${version}";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f";
};
buildInputs = [ ocaml ];
buildInputs = with ocamlPackages; [ ocaml findlib ];
dontAddPrefix = true;
installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
preFixup = "rm -rf $out/jbuilder";
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "Fast, portable and opinionated build system";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.asl20;
inherit (ocaml.meta) platforms;
inherit (ocamlPackages.ocaml.meta) platforms;
};
}