Merge pull request #29719 from winniequinn/opam-aspcud-darwin

opam: use aspcud on darwin
This commit is contained in:
Jörg Thalheim 2017-09-24 14:42:18 +01:00 committed by GitHub
commit baa55a424a

View File

@ -1,6 +1,5 @@
{ stdenv, lib, fetchgit, fetchurl, makeWrapper,
ocaml, unzip, ncurses, curl,
aspcudSupport ? !stdenv.isDarwin, aspcud
ocaml, unzip, ncurses, curl, aspcud
}:
assert lib.versionAtLeast ocaml.version "3.12.1";
@ -72,12 +71,10 @@ in stdenv.mkDerivation rec {
# Dirty, but apparently ocp-build requires a TERM
makeFlags = ["TERM=screen"];
postInstall =
if aspcudSupport then ''
wrapProgram $out/bin/opam \
--suffix PATH : ${aspcud}/bin
''
else "";
postInstall = ''
wrapProgram $out/bin/opam \
--suffix PATH : ${aspcud}/bin
'';
doCheck = false;