diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-18 11:28:41 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-18 11:28:41 +0000 |
| commit | a5e0e39cdb575a38216a2a0e9ee25eae5bb05397 (patch) | |
| tree | e6b18a2d7ec3c888344793680aeb48ddd33e7e9a /pkgs/misc/trac | |
| parent | b59d32be03c5cc10d8ebed0305524907fd062481 (diff) | |
* makeWrapper: option --run <CMD> to run a command from the wrapper.
This is so that the Unison wrapper can be generated with makeWrapper. * Use makeWrapper as a buildInput everywhere. * Updated BitTorrent, cvs2svn. svn path=/nixpkgs/trunk/; revision=10213
Diffstat (limited to 'pkgs/misc/trac')
| -rw-r--r-- | pkgs/misc/trac/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/misc/trac/default.nix | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/misc/trac/builder.sh b/pkgs/misc/trac/builder.sh index a3e97e178a017..76bf061233486 100644 --- a/pkgs/misc/trac/builder.sh +++ b/pkgs/misc/trac/builder.sh @@ -1,5 +1,4 @@ source $stdenv/setup -source $makeWrapper unpackPhase mkdir -p $out @@ -7,7 +6,6 @@ cd $name $python/bin/python setup.py install --prefix=$out for i in $(cd $out/bin && ls); do - mv $out/bin/$i $out/bin/.orig-$i - makeWrapper $out/bin/.orig-$i $out/bin/$i \ - --set PYTHONPATH "$python/site-packages:$out/lib/python2.4/site-packages:$pysqlite/lib/python2.4/site-packages:$subversion/lib/svn-python:$clearsilver/site-packages" + wrapProgram $out/bin/$i \ + --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $pysqlite):$subversion/lib/svn-python:$clearsilver/site-packages" done diff --git a/pkgs/misc/trac/default.nix b/pkgs/misc/trac/default.nix index c456c51daff94..b93c36843d329 100644 --- a/pkgs/misc/trac/default.nix +++ b/pkgs/misc/trac/default.nix @@ -3,13 +3,12 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "trac-0.9.5"; - src = fetchurl { - url = "http://ftp.edgewall.com/pub/trac/trac-0.9.5.tar.gz"; - md5 = "3b7d708eaf905cc6ba2b6b10a09a8cf4"; - }; - builder = ./builder.sh; - inherit stdenv python subversion clearsilver sqlite pysqlite makeWrapper; + name = "trac-0.9.5"; + src = fetchurl { + url = "http://ftp.edgewall.com/pub/trac/trac-0.9.5.tar.gz"; + md5 = "3b7d708eaf905cc6ba2b6b10a09a8cf4"; + }; + builder = ./builder.sh; + buildInputs = [makeWrapper]; + inherit stdenv python subversion clearsilver sqlite pysqlite; } - - |