From ec09587e5bb2e85ca6fbb51a045fd6aac9cd92d5 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sun, 11 Oct 2015 10:30:13 -0700 Subject: [PATCH] build mercurial with cf-private --- pkgs/applications/version-management/mercurial/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5a44240fa769..0557b8a2c55e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich , guiSupport ? false, tk ? null, hg-crecord ? null, curses -, ApplicationServices }: +, ApplicationServices, cf-private }: let version = "3.5.1"; @@ -20,7 +20,8 @@ stdenv.mkDerivation { buildInputs = [ python makeWrapper docutils unzip ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin ApplicationServices; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin + [ ApplicationServices cf-private ]; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03215b75ec92..0d5d321ef9b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12047,6 +12047,7 @@ let mercurial = callPackage ../applications/version-management/mercurial { inherit (pythonPackages) curses docutils hg-git dulwich; inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin) cf-private; guiSupport = false; # use mercurialFull to get hgk GUI };