diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-24 14:42:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-24 14:42:18 +0100 |
| commit | baa55a424a2e6613af728349791ac4137ad56081 (patch) | |
| tree | 006b665a0485d24dc5585e35e029193c132081cd /pkgs | |
| parent | 4151dde1d110d3140b426b0713125905354ce1ee (diff) | |
| parent | 331f5a75ce93e237d5aeb37db7612d9b609098a8 (diff) | |
| download | nixlib-baa55a424a2e6613af728349791ac4137ad56081.tar nixlib-baa55a424a2e6613af728349791ac4137ad56081.tar.gz nixlib-baa55a424a2e6613af728349791ac4137ad56081.tar.bz2 nixlib-baa55a424a2e6613af728349791ac4137ad56081.tar.lz nixlib-baa55a424a2e6613af728349791ac4137ad56081.tar.xz nixlib-baa55a424a2e6613af728349791ac4137ad56081.tar.zst nixlib-baa55a424a2e6613af728349791ac4137ad56081.zip | |
Merge pull request #29719 from winniequinn/opam-aspcud-darwin
opam: use aspcud on darwin
Diffstat (limited to 'pkgs')
| -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 28d4724a1627..63f79981e1b2 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; |