diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-12-30 01:37:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 01:37:52 +0100 |
| commit | 36326ed55dafc7c6acf31591192d0f47adb04abd (patch) | |
| tree | ccbf3e4bf34e71aafc771d8a48452bbd1f47b6fa /pkgs/applications | |
| parent | 0d321897fb91ccf092e9c077b2e4007810e54f95 (diff) | |
| parent | b3facac2cd6785a61f2eb30f5f7334ee30ee50e9 (diff) | |
| download | nixlib-36326ed55dafc7c6acf31591192d0f47adb04abd.tar nixlib-36326ed55dafc7c6acf31591192d0f47adb04abd.tar.gz nixlib-36326ed55dafc7c6acf31591192d0f47adb04abd.tar.bz2 nixlib-36326ed55dafc7c6acf31591192d0f47adb04abd.tar.lz nixlib-36326ed55dafc7c6acf31591192d0f47adb04abd.tar.xz nixlib-36326ed55dafc7c6acf31591192d0f47adb04abd.tar.zst nixlib-36326ed55dafc7c6acf31591192d0f47adb04abd.zip | |
Merge pull request #33153 from LnL7/darwin-mercurial
mercurial: don't propagate frameworks
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 774aa1082bc8..1de1fda2a5e5 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -18,12 +18,12 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - buildInputs = [ makeWrapper docutils unzip ]; + buildInputs = [ makeWrapper docutils unzip ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ hg-git dulwich ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ]; + propagatedBuildInputs = [ hg-git dulwich ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = (stdenv.lib.optionalString guiSupport '' |