diff options
| author | Winnie Quinn <me@winniequinn.com> | 2017-09-12 16:22:39 -0400 |
|---|---|---|
| committer | Winnie Quinn <me@winniequinn.com> | 2017-09-23 16:47:24 -0400 |
| commit | 331f5a75ce93e237d5aeb37db7612d9b609098a8 (patch) | |
| tree | ac4d401fc40310bcba84cbb5b044d96aeb5b9f2b /pkgs/development/tools/ocaml/opam | |
| parent | 7d98316a9745ae6538f90dc580b0873074dfd5e5 (diff) | |
| download | nixpkgs-331f5a75ce93e237d5aeb37db7612d9b609098a8.tar nixpkgs-331f5a75ce93e237d5aeb37db7612d9b609098a8.tar.gz nixpkgs-331f5a75ce93e237d5aeb37db7612d9b609098a8.tar.bz2 nixpkgs-331f5a75ce93e237d5aeb37db7612d9b609098a8.tar.lz nixpkgs-331f5a75ce93e237d5aeb37db7612d9b609098a8.tar.xz nixpkgs-331f5a75ce93e237d5aeb37db7612d9b609098a8.tar.zst nixpkgs-331f5a75ce93e237d5aeb37db7612d9b609098a8.zip | |
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.
Diffstat (limited to 'pkgs/development/tools/ocaml/opam')
| -rw-r--r-- | pkgs/development/tools/ocaml/opam/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 28d4724a162..63f79981e1b 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -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; |