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

nss: Build using system libsqlite.

Browse Source 
Let's use system SQLite library, which makes sense anyway. More importantly
because it conflicts with the sqlite package, as NSS is building this as a
shared library aswell.
This commit is contained in:
aszlig
2012-08-22 08:29:09 +02:00
parent 0e768ba98d
commit 485dcc9152
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/nss/default.nix
+5 -3
View File
@@ -1,4 +1,6 @@
{ stdenv, fetchurl, nspr, perl, zlib, includeTools ? false}: { stdenv, fetchurl, nspr, perl, zlib, sqlite
, includeTools ? false
}:
let let
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
sha256 = "f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0"; sha256 = "f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0";
}; };
buildInputs = [nspr perl zlib]; buildInputs = [ nspr perl zlib sqlite ];
patches = [ ./nss-3.12.5-gentoo-fixups.diff ]; patches = [ ./nss-3.12.5-gentoo-fixups.diff ];
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
makeFlags = makeFlags =
[ "NSPR_CONFIG_STATUS=" "NSDISTMODE=copy" "BUILD_OPT=1" "SOURCE_PREFIX=\$(out)" [ "NSPR_CONFIG_STATUS=" "NSDISTMODE=copy" "BUILD_OPT=1" "SOURCE_PREFIX=\$(out)"
"NSS_ENABLE_ECC=1" "NSS_ENABLE_ECC=1" "NSS_USE_SYSTEM_SQLITE=1"
] ]
++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; ++ stdenv.lib.optional stdenv.is64bit "USE_64=1";