diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-09-02 13:51:32 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-09-02 13:51:32 +0000 |
commit | 5d9dfc1e604f0cd9d6a87e50e500857121a069cc (patch) | |
tree | 6c694aa16f6bf9708e00967379f212fe53132b15 | |
parent | 2b119ba405637ea611c9855fddd2bef9cd374fd3 (diff) | |
download | nixlib-5d9dfc1e604f0cd9d6a87e50e500857121a069cc.tar nixlib-5d9dfc1e604f0cd9d6a87e50e500857121a069cc.tar.gz nixlib-5d9dfc1e604f0cd9d6a87e50e500857121a069cc.tar.bz2 nixlib-5d9dfc1e604f0cd9d6a87e50e500857121a069cc.tar.lz nixlib-5d9dfc1e604f0cd9d6a87e50e500857121a069cc.tar.xz nixlib-5d9dfc1e604f0cd9d6a87e50e500857121a069cc.tar.zst nixlib-5d9dfc1e604f0cd9d6a87e50e500857121a069cc.zip |
* Removed $installCommand, it's no longer needed since we split the
install and fixup phases. You can just override installPhase. svn path=/nixpkgs/trunk/; revision=12787
10 files changed, 38 insertions, 44 deletions
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 30c68a045c43..157da1a42265 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,16 +1,16 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { name = "haskell-mode-2.4"; - src = fetchurl - { + + src = fetchurl { url = "http://www.iro.umontreal.ca/~monnier/elisp/${name}.tar.gz"; sha256 = "1s2dd0clwm0qaq7z43vxx437l48c88yrd3z1a6qhbq8aak9y8jc5"; }; + buildInputs = [emacs]; - installCommand = - '' + + installPhase = '' ensureDir "$out/share/emacs/site-lisp" cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" ''; diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh index dc943180508e..39fe5852309b 100644 --- a/pkgs/applications/graphics/xfig/builder.sh +++ b/pkgs/applications/graphics/xfig/builder.sh @@ -11,8 +11,7 @@ preBuild() { xmkmf } -installCommand=myInstall -myInstall() { +installPhase() { make install.all $makeFlags wrapProgram $out/bin/xfig \ diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh index 9c8e423ce6df..79dbec0340fb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh @@ -1,9 +1,6 @@ source $stdenv/setup -buildPhase=true - -installCommand=myInstall -myInstall() { +installPhase() { mkdir -p $out/lib/mozilla/plugins cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh index eeb7e7ecbee0..b58b289da7e7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -1,7 +1,5 @@ source $stdenv/setup -buildPhase=true - dontStrip=1 dontPatchELF=1 diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh index cb40e299d9fb..62b4b5a2f884 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh @@ -12,8 +12,7 @@ PKG_CONFIG_PATH=$NIX_BUILD_TOP/pkgconfig:$PKG_CONFIG_PATH firefoxIncl=$(echo $firefox/include/firefox-*) export NIX_CFLAGS_COMPILE="-I$firefoxIncl $NIX_CFLAGS_COMPILE" -installCommand=myInstall -myInstall() { +installPhase() { ensureDir $out/lib/mozilla/plugins cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 00059c673824..8cf23085d519 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { name = "mplayerplug-in-3.55"; builder = ./builder.sh; + src = fetchurl { url = "mirror://sourceforge/mplayerplug-in/${name}.tar.gz"; sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms"; diff --git a/pkgs/development/libraries/aterm/2.7.nix b/pkgs/development/libraries/aterm/2.7.nix index b50659494108..43ae0a93a0e6 100644 --- a/pkgs/development/libraries/aterm/2.7.nix +++ b/pkgs/development/libraries/aterm/2.7.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation { sha256 = "0zhs0rncn4iankr70kbms64dwxm9i0956gs02dbw7ylx4mln8ynn"; }; - #doCheck = true; - - CFLAGS = "-O0"; + doCheck = true; meta = { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 2d0700572363..ef2b2159169f 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -2,12 +2,15 @@ stdenv.mkDerivation { name = "twisted-8.1.0"; + src = fetchurl { url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; }; + buildInputs = [python]; + propagatedBuildInputs = [ZopeInterface]; - buildPhase = "true"; - installCommand = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out"; + + installPhase = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out"; } diff --git a/pkgs/stdenv/generic/setup-new.sh b/pkgs/stdenv/generic/setup-new.sh index 188ad8961771..9fe19d91def7 100644 --- a/pkgs/stdenv/generic/setup-new.sh +++ b/pkgs/stdenv/generic/setup-new.sh @@ -679,15 +679,11 @@ installPhase() { ensureDir "$prefix" - if test -z "$installCommand"; then - installTargets=${installTargets:-install} - echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" - make ${makefile:+-f $makefile} $installTargets \ - $makeFlags "${makeFlagsArray[@]}" \ - $installFlags "${installFlagsArray[@]}" - else - eval "$installCommand" - fi + installTargets=${installTargets:-install} + echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" + make ${makefile:+-f $makefile} $installTargets \ + $makeFlags "${makeFlagsArray[@]}" \ + $installFlags "${installFlagsArray[@]}" eval "$postInstall" } diff --git a/pkgs/tools/misc/eProver/default.nix b/pkgs/tools/misc/eProver/default.nix index 0b21dfd78cde..495f98ffb04b 100644 --- a/pkgs/tools/misc/eProver/default.nix +++ b/pkgs/tools/misc/eProver/default.nix @@ -1,29 +1,32 @@ args: with args; + stdenv.mkDerivation { name = "EProver-0.999"; - src = - fetchurl { - name = "E-0.999.tar.gz"; - url = http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_0.999/E.tgz; - sha256 = "1zm1xip840hlam60kqk6xf0ikvyk7ch3ql1ac6wb68dx2l6hyhxv"; - }; + src = fetchurl { + name = "E-0.999.tar.gz"; + url = http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_0.999/E.tgz; + sha256 = "1zm1xip840hlam60kqk6xf0ikvyk7ch3ql1ac6wb68dx2l6hyhxv"; + }; - buildInputs =[which texLive]; + buildInputs = [which texLive]; preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars"; buildPhase = "make install"; # HOME=. allows to build missing TeX formats - installCommand = "mkdir -p \$out/bin; make install-exec; HOME=. make documentation ; - mkdir -p \$out/share/doc ; cp -r DOC \$out/share/doc/EProver; - echo eproof -xAuto --tstp-in --tstp-out '\"\$@\"' >\$out/bin/eproof-tptp; - chmod a+x \$out/bin/eproof-tptp; "; + installPhase = '' + mkdir -p $out/bin + make install-exec + HOME=. make documentation + mkdir -p $out/share/doc + cp -r DOC $out/share/doc/EProver + echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp + chmod a+x $out/bin/eproof-tptp + ''; meta = { - description = " - E automated theorem prover. -"; + description = "E automated theorem prover"; }; } |