JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35142 from Kaali/master

Browse Source 
rpm: Add Darwin support
This commit is contained in:
Jörg Thalheim 2018-02-21 10:18:00 +00:00 committed by GitHub
commit b6cad72585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/nspr/default.nix
View File

@ -16,6 +16,9 @@ stdenv.mkDerivation {
preConfigure = ''
cd nspr
'' + stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '@executable_path/' "$out/lib/"
substituteInPlace configure.in --replace '@executable_path/' "$out/lib/"
'';
configureFlags = [

9
pkgs/development/libraries/nss/default.nix
View File

@ -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";

5
pkgs/tools/package-management/rpm/default.nix
View File

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ];
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive libbfd ];
propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ]
++ stdenv.lib.optional stdenv.isLinux elfutils;
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
@ -59,6 +60,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
description = "The RPM Package Manager";
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}