svn merge ^/nixpkgs/trunk

A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434

18 files changed, 110 insertions, 90 deletions

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index ea7cb81a48e59..7f29b43e0e14f 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
   
   makeFlags = [ "prefix=$(out)" "verbose=yes" ];
 
+  crossAttrs = {
+    makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
+  };
+
   meta = {
     description = "Image viewing and manipulation programs";
   };
diff --git a/pkgs/applications/graphics/kuickshow/builder.sh b/pkgs/applications/graphics/kuickshow/builder.sh
index e2e0659ae34fd..2283e956f7b3c 100644
--- a/pkgs/applications/graphics/kuickshow/builder.sh
+++ b/pkgs/applications/graphics/kuickshow/builder.sh
@@ -2,11 +2,9 @@ source $stdenv/setup
 
 patchPhase=patchPhase
 patchPhase() {
-  sed -e "s@-ljpeg6b@-ljpeg@" configure > configure.patched
-  mv configure.patched configure
-  chmod u+x configure
+  sed -e "s@-ljpeg6b@-ljpeg@" -i configure
 }
 
 genericBuild
 
-ln -s $KDEDIR/share/mimelnk $out/share
\ No newline at end of file
+ln -sv $KDEDIR/share/mimelnk $out/share
diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix
index fde29735b715e..b26ac12300b05 100644
--- a/pkgs/applications/graphics/kuickshow/default.nix
+++ b/pkgs/applications/graphics/kuickshow/default.nix
@@ -1,23 +1,14 @@
-{stdenv, fetchurl, libX11, libXext, libSM, kdelibs, qt, libjpeg, libungif, libpng, libtiff, imlib, arts, expat, perl}:
+{ stdenv, fetchurl, kdelibs, imlib, cmake, pkgconfig, gettext }:
 
-stdenv.mkDerivation {
-  name = "kuickshow-0.8.5";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  name = "kuickshow-0.9.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/kuickshow/kuickshow-0.8.5.tgz;
-    md5 = "7a95852a0670b18859a1e6789b256ebd";
+    url = "http://hosti.leonde.de/~gis/${name}.tar.bz2";
+    sha256 = "0l488a6p0ligbhv6p1lnx5k2d00x9bkkvms30winifa8rmisa9wl";
   };
 
-  configureFlags = "
-    --with-imlib-config=${imlib}/bin
-    --with-extra-includes=${libjpeg}/include
-    --with-extra-libs=${libjpeg}/lib
-    --x-includes=${libX11}/include
-    --x-libraries=${libX11}/lib";
+  buildInputs = [ kdelibs imlib ];
 
-  buildInputs = [kdelibs libX11 libXext libSM qt libjpeg libungif libpng libtiff imlib arts expat perl];
-  inherit libjpeg;
-
-  KDEDIR = kdelibs;
+  buildNativeInputs = [ cmake gettext pkgconfig ];
 }
diff --git a/pkgs/applications/graphics/xara/debian-patches.nix b/pkgs/applications/graphics/xara/debian-patches.nix
new file mode 100644
index 0000000000000..dd30614618688
--- /dev/null
+++ b/pkgs/applications/graphics/xara/debian-patches.nix
@@ -0,0 +1,30 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/xaralx/0.7r1785-5";
+in
+[
+  {
+    url = "${prefix}/30_gtk_wxwidgets_symbol_clash";
+    sha256 = "1rc9dh9mnp93mad96dkp7idyhhcw7h6w0g5s92mqgzj79hqgaziz";
+  }
+  {
+    url = "${prefix}/40_algorithm_include";
+    sha256 = "03jhl1qnxj7nl8malf6v1y24aldfz87x1p2jxp04mrr35nzvyyc0";
+  }
+  {
+    url = "${prefix}/50_update_imagemagick_version_parser";
+    sha256 = "1nilsqghlr649sc14n1aqkhdx7f66rq91gqccdpi17jwijs27497";
+  }
+  {
+    url = "${prefix}/remove-icon-suffix";
+    sha256 = "160zmkgwlsanqivnip89558yvd9zvqp8ks2wbyr2aigl2rafin22";
+  }
+  {
+    url = "${prefix}/45_fix_gcc4";
+    sha256 = "06zsj0z9v5n557gj8337v6xd26clbvm4dc0qhvpvzbisq81l9jyi";
+  }
+  {
+    url = "${prefix}/55_fix_contstuctor_call";
+    sha256 = "0b14glrcwhv0ja960h56n5jm4f9563ladap2pgaywihq485ql1c1";
+  }
+]
diff --git a/pkgs/applications/graphics/xara/debian-patches.txt b/pkgs/applications/graphics/xara/debian-patches.txt
new file mode 100644
index 0000000000000..5c95d401a323f
--- /dev/null
+++ b/pkgs/applications/graphics/xara/debian-patches.txt
@@ -0,0 +1,7 @@
+xaralx/0.7r1785-5
+30_gtk_wxwidgets_symbol_clash
+40_algorithm_include
+50_update_imagemagick_version_parser
+remove-icon-suffix
+45_fix_gcc4
+55_fix_contstuctor_call
diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix
index 89ba789524fb5..8a6bac4db2b92 100644
--- a/pkgs/applications/graphics/xara/default.nix
+++ b/pkgs/applications/graphics/xara/default.nix
@@ -1,35 +1,20 @@
-{stdenv, fetchurl, autoconf, automake, gettext, libtool, cvs, wxGTK, gtk,
-pkgconfig, libxml2, zip, libpng, libjpeg, shebangfix, perl, freetype}:
+{stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig
+, wxGTK, gtk, perl, zip}:
 
 stdenv.mkDerivation {
-  name = "xaralx-0.7r1766";
+  name = "xaralx-0.7r1785";
+
   src = fetchurl {
-    url = http://downloads2.xara.com/opensource/XaraLX-0.7r1766.tar.bz2;
-    sha256 = "1rcl7hqvcai586jky7hvzxhnq8q0ka2rsmgiq5ijwclgr5d4ah7n";
+    url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2;
+    sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh";
   };
     
-  buildInputs = [automake autoconf gettext libtool cvs wxGTK gtk pkgconfig libxml2 zip libpng libjpeg shebangfix perl];
+  buildNativeInputs = [ automake pkgconfig gettext perl zip ];
+  buildInputs = [ wxGTK gtk libxml2 freetype pango ];
 
-  inherit freetype libpng libjpeg libxml2;
-  configureFlags = "--with-wx-config --disable-svnversion --disable-international";
+  configureFlags = "--disable-svnversion";
 
-  patches = [./gtk_cflags.patch];
+  patches = map fetchurl (import ./debian-patches.nix);
 
-  # Why do I need to add library path for freetype ? 
-  installPhase = "
-    make install
-    ensureDir \$out/lib
-    mv \$out/{bin,lib}/XaraLX
-cat >> \$out/bin/XaraLX << EOF
-#!/bin/sh
-LD_LIBRARY_PATH=\$freetype/lib:\$libpng/lib:\$libjpeg/lib:\$libxml2/lib:
-\$out/lib/XaraLX \"\\$@\"
-EOF
-chmod +x \$out/bin/XaraLX
-";
- 
-  patchPhase = "
-    find . -iname \"*.pl\" | xargs shebangfix;
-    unset patchPhase; patchPhase
-   "; 
+  prePatch = "patchShebangs Scripts";
 }
diff --git a/pkgs/applications/graphics/xara/gtk_cflags.patch b/pkgs/applications/graphics/xara/gtk_cflags.patch
deleted file mode 100644
index 8422360739968..0000000000000
--- a/pkgs/applications/graphics/xara/gtk_cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rc XaraLX-0.7r1766/Makefile.in XaraLX-0.7r1766.new/Makefile.in
-*** XaraLX-0.7r1766/Makefile.in	2007-01-31 13:43:04.000000000 +0100
---- XaraLX-0.7r1766.new/Makefile.in	2007-05-15 00:19:36.000000000 +0200
-***************
-*** 256,262 ****
-  @DARWIN_LINK_TRUE@XaraLX_SOURCES = Kernel/*.o wxOil/*.o tools/*.o wxXtra/*.o
-  @DARWIN_LINK_FALSE@XaraLX_LDSOURCE = -Wl,--start-group $(XaraLX_SOURCES) -Wl,--end-group
-  @DARWIN_LINK_TRUE@XaraLX_LDSOURCE = $(XaraLX_SOURCES)
-! XaraLX_LDFLAGS = --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(WX_LIBS) $(LIBS) $(LIBXML2_LIBS) -lCDraw
-  UNZIP = unzip
-  ACLOCAL_AMFLAGS = -I m4
-  all: all-recursive
---- 256,262 ----
-  @DARWIN_LINK_TRUE@XaraLX_SOURCES = Kernel/*.o wxOil/*.o tools/*.o wxXtra/*.o
-  @DARWIN_LINK_FALSE@XaraLX_LDSOURCE = -Wl,--start-group $(XaraLX_SOURCES) -Wl,--end-group
-  @DARWIN_LINK_TRUE@XaraLX_LDSOURCE = $(XaraLX_SOURCES)
-! XaraLX_LDFLAGS = --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(GTK_LIBS) $(WX_LIBS) $(LIBS) $(LIBXML2_LIBS) -lCDraw
-  UNZIP = unzip
-  ACLOCAL_AMFLAGS = -I m4
-  all: all-recursive
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index a881ef2e272da..9fff2943d3056 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,18 +3,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.4.5";
+  name = "gphoto2-2.4.11";
   
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "0bjbgz9n7ijf8167i1bm7q3pg366axgx5zydck13d2znhd30x069";
+    sha256 = "0ah42b7rnqh0z8bb96z7cdycxdh5k19h6lmfc02kdhrhqdr3q81y";
   };
   
-  buildInputs = [pkgconfig libgphoto2 libexif popt gettext libjpeg readline libtool];
+  buildNativeInputs = [ pkgconfig gettext ];
+  buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
   
-  # There is a bug in 2.4.0 configure.ac (in their m4 macroses)
-  #patchPhase = "sed -e 's@_tmp=true@_tmp=false@' -i configure configure.ac";
-
   meta = {
     homepage = http://www.gphoto.org/;
   };
diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
index 25cdd1f16463c..652450e510b46 100644
--- a/pkgs/applications/misc/taskjuggler/default.nix
+++ b/pkgs/applications/misc/taskjuggler/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl,
-zlib, libpng, libjpeg, perl, expat, qt,
+zlib, libpng, libjpeg, perl, expat, qt3,
 libX11, libXext, libSM, libICE,
 withKde, kdelibs, kdebase
 }:
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     --without-arts --disable-docs
     --x-includes=${libX11}/include
     --x-libraries=${libX11}/lib
-    --with-qt-dir=${qt}
+    --with-qt-dir=${qt3}
     --with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"}
   ";
 
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 2994ca1906524..b2f4217afb5f3 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,4 +1,4 @@
-{ composableDerivation, fetchurl, lib, qt, openssl, autoconf, automake, pkgconfig }:
+{ composableDerivation, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
 
 let inherit (composableDerivation) edf wwf; in
 
@@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} ( fixed : {
   };
 
   # TODO zaptel ? postgres ?
-  buildInputs = [ qt openssl autoconf automake pkgconfig ];
+  buildInputs = [ qt4 openssl autoconf automake pkgconfig ];
 
   # /dev/null is used when linking which is a impure path for the wrapper
   preConfigure =
diff --git a/pkgs/applications/networking/kphone/default.nix b/pkgs/applications/networking/kphone/default.nix
index 7b1c7c76dd898..dceb24a48b894 100644
--- a/pkgs/applications/networking/kphone/default.nix
+++ b/pkgs/applications/networking/kphone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, qt, pkgconfig
+{ stdenv, fetchurl, autoconf, automake, libtool, qt3, pkgconfig
 , openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
 , libSM }:
 
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
   name = "kphone-1.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/kphone/files/KPhone%20SI/KPhoneSIv1.2/kphoneSI_1.2.tar.gz;
+    url = mirror://sourceforge/kphone/kphoneSI_1.2.tar.gz;
     sha256 = "1q309n2gsdsa8d7ff2zwnyc69ngpnnj143dys90dnlmzr9ckhhg3";
   };
 
   buildInputs =
-    [ autoconf automake libtool qt pkgconfig openssl libpng alsaLib
+    [ autoconf automake libtool qt3 pkgconfig openssl libpng alsaLib
       libX11 libXext libXt libICE libSM
     ];
     
diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix
index 994f6b44f9437..2290cf5231475 100644
--- a/pkgs/applications/networking/p2p/valknut/default.nix
+++ b/pkgs/applications/networking/p2p/valknut/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt, dclib}:
+{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt3, dclib}:
 
 stdenv.mkDerivation {
   name = "valknut-0.3.7";
@@ -9,6 +9,6 @@ stdenv.mkDerivation {
     md5 = "848f9b3f25af15c3f1837133ac4b9415";
   };
 
-  buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt dclib];
+  buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt3 dclib];
   inherit openssl;
 }
diff --git a/pkgs/applications/networking/twinkle/default.nix b/pkgs/applications/networking/twinkle/default.nix
index 905f7efc43aba..0824210c4b56c 100644
--- a/pkgs/applications/networking/twinkle/default.nix
+++ b/pkgs/applications/networking/twinkle/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost
-, libsndfile, libxml2, libjpeg, readline, qt, perl, file
+, libsndfile, libxml2, libjpeg, readline, qt3, perl, file
 , alsaLib, speex, libzrtpcpp, xorg }:
         
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ pkgconfig commoncpp2 ccrtp openssl boost libsndfile
-      libxml2 libjpeg readline qt perl file
+      libxml2 libjpeg readline qt3 perl file
       # optional ? :
       alsaLib
       speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index 6c3a469439535..0df148ce39077 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation {
     git texinfo
   ];
 
+  CPPFLAGS = "-I${gmp}/include -I${mpfr}/include";
+
+  LDFLAGS = "-L${gmp}/lib -L${mpfr}/lib";
+
   buildPhase = ''
     sed -i acprep \
       -e 's|search_prefixes = .*|search_prefixes = ["${boost}"]|'
@@ -25,7 +29,9 @@ stdenv.mkDerivation {
     python acprep update --no-pch --prefix=$out
   '';
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = "http://ledger-cli.org/";
@@ -39,7 +45,7 @@ stdenv.mkDerivation {
       their data, there really is no alternative.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 1bc8e586e33f7..c1cd4b42a02aa 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
       their data, there really is no alternative.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 24060c277fd44..4c1cf318b5a23 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -1,4 +1,4 @@
-{ fetchsvn, stdenv, cmake, qt, mesa }:
+{ fetchsvn, stdenv, cmake, qt4, mesa }:
 
 # ViTE 1.1 has several bugs, so use the SVN version.
 let
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   patches = [ ./larger-line-buffer.patch ];
 
-  buildInputs = [ cmake qt mesa ];
+  buildInputs = [ cmake qt4 mesa ];
 
   NIX_LDFLAGS = "-lGLU";
 
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 6ca6651c5717f..821c37d9c5180 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchurl, which, qt3, x11, xlibs
+a@{ stdenv, fetchurl, which, qt3, x11, xlibs
 , lame, zlib, mesa, alsaLib
 , freetype, perl
 }:
 
-assert qt3.mysqlSupport;
+let
+  qt3 = a.qt3.override { mysqlSupport = true; };
+in
 
 stdenv.mkDerivation {
   name = "mythtv-0.21";
diff --git a/pkgs/applications/virtualization/qemu/0.15.nix b/pkgs/applications/virtualization/qemu/0.15.nix
new file mode 100644
index 0000000000000..f75b212924305
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/0.15.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "qemu-0.15.1";
+
+  src = fetchurl {
+    url = "http://wiki.qemu.org/download/${name}.tar.gz";
+    sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp";
+  };
+
+  buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
+
+  meta = {
+    description = "QEmu processor emulator";
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}