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

opam: use aspcud on darwin

Browse Source 
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
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/ocaml/opam/default.nix
View File

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