Author: viric
Date: Sat Apr 14 21:40:55 2012
New Revision: 33788
URL: https://nixos.org/websvn/nix/?rev=33788&sc=1
Log:
Adding a version of sqlite with more things, based on the upstream repository
src.
Added:
nixpkgs/trunk/pkgs/development/libraries/sqlite/full.nix
Modified:
nixpkgs/trunk/pkgs/development/interpreters/tcl/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/tcl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/tcl/default.nix Sat Apr 14
18:58:30 2012 (r33787)
+++ nixpkgs/trunk/pkgs/development/interpreters/tcl/default.nix Sat Apr 14
21:40:55 2012 (r33788)
@@ -19,4 +19,8 @@
description = "The Tcl scription language";
homepage = http://www.tcl.tk/;
};
+
+ passthru = {
+ libdir = "lib/tcl8.5";
+ };
}
Added: nixpkgs/trunk/pkgs/development/libraries/sqlite/full.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/sqlite/full.nix Sat Apr 14
21:40:55 2012 (r33788)
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, tcl, readline ? null, ncurses ? null }:
+
+assert readline != null -> ncurses != null;
+
+stdenv.mkDerivation {
+ # I try to keep a version no newer than default.nix, and similar CFLAGS,
+ # for this to be compatible with it.
+ name = "sqlite-3.7.9-full";
+
+ src = fetchurl {
+ url =
"http://www.sqlite.org/cgi/src/tarball/SQLite-3.7.9.tar.gz?uuid=version-3.7.9";;
+ sha256 = "0v11slxgjpx2nv7wp8c76wk2pa1dijs9v6zlcn2dj9jblp3bx8fk";
+ };
+
+ buildInputs = [ readline ncurses ];
+ buildNativeInputs = [ tcl ];
+
+ doCheck = true;
+ checkTarget = "test";
+
+ configureFlags = "--enable-threadsafe --enable-tempstore";
+
+ preConfigure = ''
+ export TCLLIBDIR=$out/${tcl.libdir}
+ '';
+
+ CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
+ LDFLAGS = if readline != null then "-lncurses" else "";
+
+ postInstall = ''
+ make sqlite3_analyzer
+ cp sqlite3_analyzer $out/bin
+ '';
+
+ meta = {
+ homepage = http://www.sqlite.org/;
+ description = "A self-contained, serverless, zero-configuration,
transactional SQL database engine";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; all;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Apr 14 18:58:30
2012 (r33787)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Apr 14 21:40:55
2012 (r33788)
@@ -4715,6 +4715,10 @@
inherit readline ncurses;
});
+ sqliteFull = callPackage ../development/libraries/sqlite/full.nix {
+ inherit readline ncurses;
+ };
+
stlport = callPackage ../development/libraries/stlport { };
strigi = callPackage ../development/libraries/strigi {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
