mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
nss: Remove redundant nss-config.in.
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:
parent
38a4d77665
commit
c672997dc6
@ -4,11 +4,6 @@
|
||||
|
||||
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 {
|
||||
url = "git://git.fedorahosted.org/git/nss-pem.git";
|
||||
rev = "07a683505d4a0a1113c4085c1ce117425d0afd80";
|
||||
@ -65,34 +60,15 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
buildFlags = [ "build_coreconf" "build_dbm" "all" ];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
#find $out -name "*.a" | xargs rm
|
||||
postInstall = ''
|
||||
rm -rf $out/private
|
||||
mv $out/public $out/include
|
||||
mv $out/*.OBJ/* $out/
|
||||
rmdir $out/*.OBJ
|
||||
${if includeTools then "" else "rm -rf $out/bin"}
|
||||
${if includeTools then "" else "rm -rf $out/bin; mkdir $out/bin"}
|
||||
|
||||
# Borrowed from Gentoo. Firefox expects an nss-config script,
|
||||
# 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
|
||||
''; # */
|
||||
cp -av config/nss-config $out/bin/nss-config
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
for libname in freebl3 nssdbm3 softokn3
|
||||
|
Loading…
Reference in New Issue
Block a user