* Move the substitution functions into stdenv (not merged yet).
* If the environment variable buildCommand is set, then eval that
instead of doing the build phases. This is used by the runCommand
function in all-packages.nix to allow one-lines like
foo = runCommand "foo" {} "mkdir $out; echo foo > $out/foo";
svn path=/nixpkgs/trunk/; revision=7298
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
source $stdenv/setup
|
||||
source $substituter
|
||||
source $substitute
|
||||
|
||||
configurePhase() {
|
||||
substituteInPlace "setup.cfg" \
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{stdenv, fetchurl, python, sqlite, substituter}:
|
||||
{stdenv, fetchurl, python, sqlite, substitute}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pysqlite-2.2.2";
|
||||
src = fetchurl {
|
||||
url = "http://initd.org/pub/software/pysqlite/releases/2.2/2.2.2/pysqlite-2.2.2.tar.gz";
|
||||
md5 = "3260547d3f11c85613b2de8ed529a4fc";
|
||||
};
|
||||
builder = ./builder.sh;
|
||||
name = "pysqlite-2.2.2";
|
||||
src = fetchurl {
|
||||
url = "http://initd.org/pub/software/pysqlite/releases/2.2/2.2.2/pysqlite-2.2.2.tar.gz";
|
||||
md5 = "3260547d3f11c85613b2de8ed529a4fc";
|
||||
};
|
||||
builder = ./builder.sh;
|
||||
|
||||
inherit stdenv python sqlite substituter;
|
||||
inherit stdenv python sqlite substitute;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user