diff options
| author | ajs124 <git@ajs124.de> | 2020-07-20 17:02:44 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:52:34 +0000 |
| commit | f8462a0e0e018102bfd913edaafbcd2f90c83a2f (patch) | |
| tree | e36b00ac506846cd7f13c23d82c80b0a88b38e1e /nixpkgs/pkgs/development/libraries/nss | |
| parent | ea47d5a37637da7e0800a72490ea5924cdf02fd0 (diff) | |
| download | nixlib-f8462a0e0e018102bfd913edaafbcd2f90c83a2f.tar nixlib-f8462a0e0e018102bfd913edaafbcd2f90c83a2f.tar.gz nixlib-f8462a0e0e018102bfd913edaafbcd2f90c83a2f.tar.bz2 nixlib-f8462a0e0e018102bfd913edaafbcd2f90c83a2f.tar.lz nixlib-f8462a0e0e018102bfd913edaafbcd2f90c83a2f.tar.xz nixlib-f8462a0e0e018102bfd913edaafbcd2f90c83a2f.tar.zst nixlib-f8462a0e0e018102bfd913edaafbcd2f90c83a2f.zip | |
nss: try to fix darwin build
(cherry picked from commit 8f925208cde51b12bbce209c635d641c9ca31751)
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nss')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/nss/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
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"; |