diff options
Diffstat (limited to 'pkgs/applications')
26 files changed, 32 insertions, 87 deletions
diff --git a/pkgs/applications/audio/bmp-plugins/wma/builder.sh b/pkgs/applications/audio/bmp-plugins/wma/builder.sh deleted file mode 100644 index c70264d098c4d..0000000000000 --- a/pkgs/applications/audio/bmp-plugins/wma/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -buildFlags="-f Makefile.bmp" - -installPhase=installPhase -installPhase() { - ensureDir "$out/lib/bmp/Input" - cp libwma.so "$out/lib/bmp/Input" -} - -genericBuild diff --git a/pkgs/applications/audio/bmp-plugins/wma/default.nix b/pkgs/applications/audio/bmp-plugins/wma/default.nix index 2812f4ce280ff..617db6232a7d4 100644 --- a/pkgs/applications/audio/bmp-plugins/wma/default.nix +++ b/pkgs/applications/audio/bmp-plugins/wma/default.nix @@ -2,10 +2,18 @@ stdenv.mkDerivation { name = "bmp-plugin-wma-1.0.5"; - builder = ./builder.sh; + src = fetchurl { url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2; md5 = "5d62a0f969617aeb40096362c7a8a506"; }; + buildInputs = [pkgconfig bmp]; + + buildFlags = "-f Makefile.bmp"; + + installPhase = '' + ensureDir "$out/lib/bmp/Input" + cp libwma.so "$out/lib/bmp/Input" + ''; } diff --git a/pkgs/applications/editors/emacs-21/builder.sh b/pkgs/applications/editors/emacs-21/builder.sh index e9c909739d53c..acd98aefd0482 100644 --- a/pkgs/applications/editors/emacs-21/builder.sh +++ b/pkgs/applications/editors/emacs-21/builder.sh @@ -8,6 +8,5 @@ postConfigure() { cp $myglibc/lib/crti.o src cp $myglibc/lib/crtn.o src } -postConfigure=postConfigure genericBuild diff --git a/pkgs/applications/editors/emacs-22/builder.sh b/pkgs/applications/editors/emacs-22/builder.sh index 33e72409ea11d..7a82f6552efc1 100644 --- a/pkgs/applications/editors/emacs-22/builder.sh +++ b/pkgs/applications/editors/emacs-22/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { libc=$(cat ${NIX_GCC}/nix-support/orig-libc) echo "libc: $libc" diff --git a/pkgs/applications/editors/emacs-unicode/builder.sh b/pkgs/applications/editors/emacs-unicode/builder.sh index 953965716b705..677311c4fd304 100644 --- a/pkgs/applications/editors/emacs-unicode/builder.sh +++ b/pkgs/applications/editors/emacs-unicode/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { libc=$(cat ${NIX_GCC}/nix-support/orig-libc) echo "libc: $libc" diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh index a4f6edad04c3d..c069edb3a6d4e 100644 --- a/pkgs/applications/editors/monodevelop/builder.sh +++ b/pkgs/applications/editors/monodevelop/builder.sh @@ -3,7 +3,6 @@ source $makeWrapper export MONO_GAC_PREFIX=$monodoc:$gtksharp -postInstall=postInstall postInstall() { mv $out/bin $out/bin-orig mkdir $out/bin diff --git a/pkgs/applications/editors/monodoc/builder.sh b/pkgs/applications/editors/monodoc/builder.sh index ee80be9d95c42..bcea7a7a89afd 100644 --- a/pkgs/applications/editors/monodoc/builder.sh +++ b/pkgs/applications/editors/monodoc/builder.sh @@ -1,7 +1,6 @@ source $stdenv/setup source $makeWrapper -postInstall=postInstall postInstall() { mv $out/bin $out/bin-orig mkdir $out/bin diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh index a16ff3f32e92e..51b5f1836546b 100644 --- a/pkgs/applications/editors/nedit/builder.sh +++ b/pkgs/applications/editors/nedit/builder.sh @@ -2,7 +2,6 @@ source $stdenv/setup export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" -installPhase=installPhase installPhase() { ensureDir $out/bin cp -p source/nedit source/nc $out/bin diff --git a/pkgs/applications/graphics/f-spot/builder.sh b/pkgs/applications/graphics/f-spot/builder.sh index 2e3aaf894bf0c..252c4f91e0c6f 100644 --- a/pkgs/applications/graphics/f-spot/builder.sh +++ b/pkgs/applications/graphics/f-spot/builder.sh @@ -1,7 +1,6 @@ source $stdenv/setup source $makeWrapper -postInstall=postInstall postInstall() { mv $out/bin $out/bin-orig mkdir $out/bin diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh index 39fe5852309b3..3f3f2d7649ae5 100644 --- a/pkgs/applications/graphics/xfig/builder.sh +++ b/pkgs/applications/graphics/xfig/builder.sh @@ -2,7 +2,6 @@ source $stdenv/setup makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man" -preBuild=preBuild preBuild() { echo "#define XAW3D" >> Imakefile.tmp echo "#define XAW3D1_5E" >> Imakefile.tmp diff --git a/pkgs/applications/misc/cdrtools/builder.sh b/pkgs/applications/misc/cdrtools/builder.sh deleted file mode 100644 index 0e2afe0829984..0000000000000 --- a/pkgs/applications/misc/cdrtools/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -prefix=$out - -configurePhase() { - echo ; -} - -configurePhase=configurePhase - -genericBuild diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 271ed1a7ebb2e..94af2ee58f552 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -2,7 +2,9 @@ stdenv.mkDerivation { name = "cdrtools-2.01"; - builder = ./builder.sh; + + configurePhase = "prefix=$out"; + #hack, I'm getting "chown: invalid user: `bin" error, so replace chown by a nop dummy script preInstall = '' mkdir "$TMP/bin" @@ -12,10 +14,12 @@ stdenv.mkDerivation { PATH="$TMP/bin:$PATH" done ''; + src = fetchurl { url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2; md5 = "d44a81460e97ae02931c31188fe8d3fd"; }; + patches = [./cdrtools-2.01-install.patch]; meta = { diff --git a/pkgs/applications/networking/browsers/firefox-2/builder.sh b/pkgs/applications/networking/browsers/firefox-2/builder.sh index 4fa7fbb84ab5f..e77bd2211de2b 100644 --- a/pkgs/applications/networking/browsers/firefox-2/builder.sh +++ b/pkgs/applications/networking/browsers/firefox-2/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -postInstall=postInstall postInstall() { # Strip some more stuff diff --git a/pkgs/applications/networking/browsers/mozilla/builder.sh b/pkgs/applications/networking/browsers/mozilla/builder.sh index c82d3d9783ea4..483585dd17093 100644 --- a/pkgs/applications/networking/browsers/mozilla/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { cat > .mozconfig <<EOF #. \$topsrcdir/browser/config/mozconfig @@ -20,7 +19,6 @@ ac_add_options --enable-default-toolkit=gtk2 EOF } -#postInstall=postInstall postInstall() { # Strip some more stuff diff --git a/pkgs/applications/networking/browsers/opera/builder.sh b/pkgs/applications/networking/browsers/opera/builder.sh index 7b83f425557bc..e9efbe0682988 100644 --- a/pkgs/applications/networking/browsers/opera/builder.sh +++ b/pkgs/applications/networking/browsers/opera/builder.sh @@ -1,11 +1,9 @@ source $stdenv/setup -buildPhase=buildPhase buildPhase() { true } -installPhase=installPhase installPhase() { set -x diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh b/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh index cb7a22fc3af3e..c4b477fcec5a0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh +++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -postInstall=postInstall postInstall() { # Strip some more stuff diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 0c8ebc8513906..dbfbbb47496e7 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -5,12 +5,10 @@ export NO_HIDS=TRUE export PATH=$icu/sbin:$PATH -postUnpack=postUnpack postUnpack() { tar xvjf $src_system } -preConfigure=preConfigure preConfigure() { for i in sysui/desktop/share/makefile.mk; do substituteInPlace $i --replace /bin/bash $shell @@ -23,8 +21,6 @@ preConfigure() { cd config_office/ } - -postConfigure=postConfigure postConfigure() { cd .. for i in LinuxX86*Env.Set; do @@ -35,15 +31,12 @@ postConfigure() { --replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so } - -buildPhase=buildPhase buildPhase() { source LinuxX86*Env.Set.sh ./bootstrap dmake # wait a few hours... } - wrapSOffice() { local fn=$1 local arg=$2 @@ -61,8 +54,6 @@ EOF chmod +x $out/bin/$fn } - -installPhase=installPhase installPhase() { ooFiles=$out/lib/openoffice @@ -85,6 +76,5 @@ installPhase() { for i in writer calc draw impress base math web; do wrapSOffice oo$i -$i; done } - genericBuild diff --git a/pkgs/applications/taxes/aangifte-2005/builder.sh b/pkgs/applications/taxes/aangifte-2005/builder.sh index 8e01f6b8b3e0c..e6b2bb8787ec3 100644 --- a/pkgs/applications/taxes/aangifte-2005/builder.sh +++ b/pkgs/applications/taxes/aangifte-2005/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -buildPhase=buildPhase buildPhase() { for i in bin/*; do patchelf \ @@ -10,10 +9,9 @@ buildPhase() { done } -installPhase=installPhase installPhase() { ensureDir $out cp -prvd * $out/ } -genericBuild \ No newline at end of file +genericBuild diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh index 8e01f6b8b3e0c..e6b2bb8787ec3 100644 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ b/pkgs/applications/taxes/aangifte-2006/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -buildPhase=buildPhase buildPhase() { for i in bin/*; do patchelf \ @@ -10,10 +9,9 @@ buildPhase() { done } -installPhase=installPhase installPhase() { ensureDir $out cp -prvd * $out/ } -genericBuild \ No newline at end of file +genericBuild diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh index e2d2658024a49..e89ba5ae36ff9 100644 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ b/pkgs/applications/taxes/aangifte-2007/builder.sh @@ -2,7 +2,6 @@ source $stdenv/setup echo $NIX_GCC -buildPhase=buildPhase buildPhase() { for i in bin/*; do patchelf \ @@ -12,10 +11,9 @@ buildPhase() { done } -installPhase=installPhase installPhase() { ensureDir $out cp -prvd * $out/ } -genericBuild \ No newline at end of file +genericBuild diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh index e2d2658024a49..e89ba5ae36ff9 100644 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ b/pkgs/applications/taxes/aangifte-2008/builder.sh @@ -2,7 +2,6 @@ source $stdenv/setup echo $NIX_GCC -buildPhase=buildPhase buildPhase() { for i in bin/*; do patchelf \ @@ -12,10 +11,9 @@ buildPhase() { done } -installPhase=installPhase installPhase() { ensureDir $out cp -prvd * $out/ } -genericBuild \ No newline at end of file +genericBuild diff --git a/pkgs/applications/video/MPlayer/rp9codecs/builder.sh b/pkgs/applications/video/MPlayer/rp9codecs/builder.sh deleted file mode 100644 index b8dfd5ce6b8ee..0000000000000 --- a/pkgs/applications/video/MPlayer/rp9codecs/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -buildPhase=true - -installPhase() { - mkdir $out - cp -prv * $out -} -installPhase=installPhase - -genericBuild diff --git a/pkgs/applications/video/MPlayer/rp9codecs/default.nix b/pkgs/applications/video/MPlayer/rp9codecs/default.nix index 27d95f21604f4..4456fc031a7d8 100644 --- a/pkgs/applications/video/MPlayer/rp9codecs/default.nix +++ b/pkgs/applications/video/MPlayer/rp9codecs/default.nix @@ -1,8 +1,15 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { +{stdenv, fetchurl}: + +stdenv.mkDerivation { name = "MPlayer-rp9codecs-20050115"; - builder = ./builder.sh; + src = fetchurl { url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/rp9codecs-20050115.tar.bz2; sha256 = "353c22e2c992a1c730bdd5fade66a94e1a058e38063d2ce064a6510b70c39677"; }; + + installPhase = '' + mkdir $out + cp -prv * $out + ''; } diff --git a/pkgs/applications/video/MPlayer/win32codecs/builder.sh b/pkgs/applications/video/MPlayer/win32codecs/builder.sh deleted file mode 100644 index b8dfd5ce6b8ee..0000000000000 --- a/pkgs/applications/video/MPlayer/win32codecs/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -buildPhase=true - -installPhase() { - mkdir $out - cp -prv * $out -} -installPhase=installPhase - -genericBuild diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix index e4e73f6ede35d..569b67803744a 100644 --- a/pkgs/applications/video/MPlayer/win32codecs/default.nix +++ b/pkgs/applications/video/MPlayer/win32codecs/default.nix @@ -3,13 +3,16 @@ stdenv.mkDerivation { name = "MPlayer-codecs-essential-20071007"; - builder = ./builder.sh; - src = fetchurl { url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2; sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; }; + installPhase = '' + mkdir $out + cp -prv * $out + ''; + meta = { license = "unfree"; }; diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh index 3119b78930113..c73132b47bcc1 100644 --- a/pkgs/applications/video/mythtv/builder.sh +++ b/pkgs/applications/video/mythtv/builder.sh @@ -15,7 +15,6 @@ buildPhase() { } -postInstall=postInstall postInstall() { sqlDir="$out/share/mythtv/sql" ensureDir $sqlDir |