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

nss: Remove redundant nss-config.in.

Browse Source 
This file is already contained in nss-3.12.5-gentoo-fixups.diff, so we don't
need to do all that cruft twice.
This commit is contained in:
aszlig 2012-08-22 04:22:43 +02:00
parent 38a4d77665
commit c672997dc6
1 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,6 @@
let let
nssConfig = fetchurl {
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-libs/nss/files/3.12-nss-config.in?rev=1.2";
sha256 = "1ck9q68fxkjq16nflixbqi4xc6bmylmj994h3f1j42g8mp0xf0vd";
};
nssPEM = fetchgit { nssPEM = fetchgit {
url = "git://git.fedorahosted.org/git/nss-pem.git"; url = "git://git.fedorahosted.org/git/nss-pem.git";
rev = "07a683505d4a0a1113c4085c1ce117425d0afd80"; rev = "07a683505d4a0a1113c4085c1ce117425d0afd80";
@ -65,34 +60,15 @@ in stdenv.mkDerivation rec {
buildFlags = [ "build_coreconf" "build_dbm" "all" ]; buildFlags = [ "build_coreconf" "build_dbm" "all" ];
postInstall = postInstall = ''
'' rm -rf $out/private
#find $out -name "*.a" | xargs rm mv $out/public $out/include
rm -rf $out/private mv $out/*.OBJ/* $out/
mv $out/public $out/include rmdir $out/*.OBJ
mv $out/*.OBJ/* $out/ ${if includeTools then "" else "rm -rf $out/bin; mkdir $out/bin"}
rmdir $out/*.OBJ
${if includeTools then "" else "rm -rf $out/bin"}
# Borrowed from Gentoo. Firefox expects an nss-config script, cp -av config/nss-config $out/bin/nss-config
# but NSS doesn't provide it. '';
NSS_VMAJOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
${if includeTools then "" else "mkdir $out/bin"}
cp ${nssConfig} $out/bin/nss-config
chmod u+x $out/bin/nss-config
substituteInPlace $out/bin/nss-config \
--subst-var-by MOD_MAJOR_VERSION $NSS_VMAJOR \
--subst-var-by MOD_MINOR_VERSION $NSS_VMINOR \
--subst-var-by MOD_PATCH_VERSION $NSS_VPATCH \
--subst-var-by prefix $out \
--subst-var-by exec_prefix $out \
--subst-var-by includedir $out/include/nss \
--subst-var-by libdir $out/lib
''; # */
postFixup = '' postFixup = ''
for libname in freebl3 nssdbm3 softokn3 for libname in freebl3 nssdbm3 softokn3