From aacd3e526799516e46e229e05ee25518063d3419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Tue, 20 Feb 2018 12:12:24 +0200 Subject: [PATCH] nss: link libraries with absolute paths on Darwin --- pkgs/development/libraries/nss/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8d799e2c13a..a8f36af5df5 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite }: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }: let @@ -16,7 +16,8 @@ in stdenv.mkDerivation rec { sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3"; }; - buildInputs = [ perl zlib sqlite ]; + buildInputs = [ perl zlib sqlite ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ nspr ]; @@ -33,6 +34,10 @@ 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";