From f8462a0e0e018102bfd913edaafbcd2f90c83a2f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 20 Jul 2020 17:02:44 +0200 Subject: nss: try to fix darwin build (cherry picked from commit 8f925208cde51b12bbce209c635d641c9ca31751) --- nixpkgs/pkgs/development/libraries/nss/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'nixpkgs/pkgs/development/libraries/nss') diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix index 12a2e49e9294..ab1f05044708 100644 --- a/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages, ninja }: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja }: let nssPEM = fetchurl { @@ -19,7 +19,8 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]; + nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ zlib sqlite ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -53,10 +54,6 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" - ''; - outputs = [ "out" "dev" "tools" ]; preConfigure = "cd nss"; -- cgit 1.4.1