* Make subversion.fix a function (i.e., allow its variation points to

be bound).

svn path=/nixpkgs/trunk/; revision=251
This commit is contained in:
Eelco Dolstra 2003-08-05 13:33:13 +00:00
parent 49f7a4afd1
commit 8aebc012a9
2 changed files with 32 additions and 22 deletions

View file

@ -1,25 +1,28 @@
Package( Function(["localServer", "httpsClient", "httpServer", "pythonBindings"],
[ ("name", "subversion-0.26.0")
, ("build", Relative("subversion/subversion-build.sh")) Package(
, ("setenv", Relative("helpers/set-env.sh")) [ ("name", "subversion-0.26.0")
, ("src", App(IncludeFix("fetchurl/fetchurl.fix"), , ("build", Relative("subversion/subversion-build.sh"))
[ ("url", "http://subversion.tigris.org/files/documents/15/5322/subversion-0.26.0.tar.gz") , ("setenv", Relative("helpers/set-env.sh"))
, ("md5", "700caa3f59b585d173812c4a078feeba")
]))
, ("localServer", "1") , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
, ("httpsClient", "1") [ ("url", "http://subversion.tigris.org/files/documents/15/5322/subversion-0.26.0.tar.gz")
, ("httpServer", "1") , ("md5", "700caa3f59b585d173812c4a078feeba")
, ("httpsServer", "1") ]))
, ("pythonBindings", "1")
, ("stdenv", IncludeFix("stdenv/stdenv.fix")) , ("localServer", Var("localServer"))
, ("ssl", IncludeFix("openssl/openssl.fix")) , ("httpsClient", Var("httpsClient"))
, ("swig", IncludeFix("swig/swig.fix")) , ("httpServer", Var("httpServer"))
, ("httpd", IncludeFix("httpd/httpd.fix")) , ("httpsServer", True)
, ("db4", IncludeFix("db4/db4.fix")) , ("pythonBindings", Var("pythonBindings"))
, ("libxml", IncludeFix("libxml2/libxml2.fix"))
] , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
) , ("ssl", If(Var("httpsClient"), IncludeFix("openssl/openssl.fix"), ""))
, ("swig", If(Var("pythonBindings"), IncludeFix("swig/swig.fix"), ""))
, ("httpd", If(Var("httpServer"), IncludeFix("httpd/httpd.fix"), ""))
, ("db4", If(Var("localServer"), IncludeFix("db4/db4.fix"), ""))
, ("libxml", IncludeFix("libxml2/libxml2.fix"))
]
)
)

View file

@ -2,7 +2,14 @@ Package(
[ ("name", "system") [ ("name", "system")
, ("build", Relative("system/populate-linkdirs.pl")) , ("build", Relative("system/populate-linkdirs.pl"))
, ("actSubversion", IncludeFix("subversion/subversion.fix")) , ("actSubversion",
Call(IncludeFix("subversion/subversion.fix"),
[ ("localServer", True)
, ("httpsClient", True)
, ("httpServer", True)
, ("pythonBindings", True)
]))
, ("actStrategoXT", IncludeFix("strategoxt/strategoxt.fix")) , ("actStrategoXT", IncludeFix("strategoxt/strategoxt.fix"))
, ("actATerm", IncludeFix("aterm/aterm.fix")) , ("actATerm", IncludeFix("aterm/aterm.fix"))
, ("actPan", IncludeFix("pan/pan.fix")) , ("actPan", IncludeFix("pan/pan.fix"))