From a79ff78ec42149964218e4196a34660cabfa7e15 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Aug 2016 23:24:44 -0500 Subject: [PATCH] nspr: fix darwin build - needs CoreServices --- pkgs/development/libraries/nspr/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 23f7ffb0ce8..e8ba9c7ec54 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl +, CoreServices ? null }: let version = "4.12"; in @@ -27,6 +28,8 @@ stdenv.mkDerivation { moveToOutput share "$dev" # just aclocal ''; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cebcea53caa..cd813e3dcef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8868,7 +8868,9 @@ in non = callPackage ../applications/audio/non { }; - nspr = callPackage ../development/libraries/nspr { }; + nspr = callPackage ../development/libraries/nspr { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; nss = lowPrio (callPackage ../development/libraries/nss { }); nssTools = nss.tools;