diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:14:57 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:14:57 +0000 |
commit | 138c0ae751174ae6859589a9c9d517e45c14dc18 (patch) | |
tree | f0d6067ca147457c552f2c113c5697dc99547163 /pkgs/development/libraries/pysqlite | |
parent | f6d923febc594c7a1fc3295e01972b049569e292 (diff) | |
download | nixpkgs-138c0ae751174ae6859589a9c9d517e45c14dc18.tar nixpkgs-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.gz nixpkgs-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.bz2 nixpkgs-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.lz nixpkgs-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.xz nixpkgs-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.zst nixpkgs-138c0ae751174ae6859589a9c9d517e45c14dc18.zip |
* Merge the new generic builder.
* Removed substitute, it's part of the generic builder now. * stdenv-initial (Linux): use the real generic builder script. This does require that sed is in the path of the builder of the initial stdenv. svn path=/nixpkgs/trunk/; revision=7498
Diffstat (limited to 'pkgs/development/libraries/pysqlite')
-rw-r--r-- | pkgs/development/libraries/pysqlite/builder.sh | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/pysqlite/default.nix | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/pysqlite/builder.sh b/pkgs/development/libraries/pysqlite/builder.sh index aab781eb55c..e1ca0e4a8fc 100644 --- a/pkgs/development/libraries/pysqlite/builder.sh +++ b/pkgs/development/libraries/pysqlite/builder.sh @@ -1,5 +1,4 @@ source $stdenv/setup -source $substitute configurePhase() { substituteInPlace "setup.cfg" \ diff --git a/pkgs/development/libraries/pysqlite/default.nix b/pkgs/development/libraries/pysqlite/default.nix index 2671e7a08c5..1a3e8c05dc3 100644 --- a/pkgs/development/libraries/pysqlite/default.nix +++ b/pkgs/development/libraries/pysqlite/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, sqlite, substitute}: +{stdenv, fetchurl, python, sqlite}: stdenv.mkDerivation { name = "pysqlite-2.2.2"; @@ -8,5 +8,5 @@ stdenv.mkDerivation { }; builder = ./builder.sh; - inherit stdenv python sqlite substitute; + inherit stdenv python sqlite; } |