about summary refs log tree commit diff
path: root/pkgs/development/libraries/nss
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2012-08-20 09:39:55 +0200
committeraszlig <aszlig@redmoonstudios.org>2012-08-22 08:29:09 +0200
commit485dcc915283661a5d859313484aa8ecaf1a520d (patch)
treeba1cd08198713d5e37c2713647bc416b9e5b2c31 /pkgs/development/libraries/nss
parent0e768ba98d96148b0f1630e8712234be8b9300fc (diff)
downloadnixlib-485dcc915283661a5d859313484aa8ecaf1a520d.tar
nixlib-485dcc915283661a5d859313484aa8ecaf1a520d.tar.gz
nixlib-485dcc915283661a5d859313484aa8ecaf1a520d.tar.bz2
nixlib-485dcc915283661a5d859313484aa8ecaf1a520d.tar.lz
nixlib-485dcc915283661a5d859313484aa8ecaf1a520d.tar.xz
nixlib-485dcc915283661a5d859313484aa8ecaf1a520d.tar.zst
nixlib-485dcc915283661a5d859313484aa8ecaf1a520d.zip
nss: Build using system libsqlite.
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.
Diffstat (limited to 'pkgs/development/libraries/nss')
-rw-r--r--pkgs/development/libraries/nss/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 2a4ebbfc4318..7bdbf9e199f4 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, nspr, perl, zlib, includeTools ? false}:
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite
+, includeTools ? false
+}:
 
 let
 
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0";
   };
 
-  buildInputs = [nspr perl zlib];
+  buildInputs = [ nspr perl zlib sqlite ];
 
   patches = [ ./nss-3.12.5-gentoo-fixups.diff ];
 
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
 
   makeFlags =
     [ "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";