opam: use aspcud on darwin

aspcud is the recommended solver for OPAM and the `aspcud` package is
now building properly on Darwin. As such, we can remove the special case
for Darwin that required OPAM to fall back to the built-in solver.
This commit is contained in:
Winnie Quinn 2017-09-12 16:22:39 -04:00
parent 7d98316a97
commit 331f5a75ce

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;