Merge branch master into staging

19 files changed, 88 insertions, 82 deletions

diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 45f29496f62f..754a3ce68f65 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurlGnome, pkgconfig, glib, libIDL, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "ORBit2";
-    major = "2"; minor = "14"; patchlevel = "19";
+  name = "ORBit2-${minVer}.19";
+  minVer = "2.14";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/ORBit2/${minVer}/${name}.tar.bz2";
     sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
index 045f60e8b606..356d4df9d1d8 100644
--- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurlGnome, pkgconfig, GConf, gtkmm, glibmm }:
+{ stdenv, fetchurl, pkgconfig, GConf, gtkmm, glibmm }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gconfmm-${minVer}.3";
+  minVer = "2.28";
 
-  src = fetchurlGnome {
-    project = "gconfmm";
-    major = "2"; minor = "28"; patchlevel = "3"; extension = "bz2";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gconfmm/${minVer}/${name}.tar.bz2";
     sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
   };
 
-  nativeBuildInputs = [pkgconfig];
+  nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ GConf gtkmm glibmm ];
 
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index dba47b6e5410..6cb8ff336a0d 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchurlGnome, which }:
+{ stdenv, fetchurl, which }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gnome-common-${minVer}.0";
+  minVer = "2.34";
 
-  src = fetchurlGnome {
-    project = "gnome-common";
-    major = "2"; minor = "34"; patchlevel = "0";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-common/${minVer}/${name}.tar.bz2";
     sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index dd8b78228580..692233930603 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurlGnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
+{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
 , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gnome-vfs-${minVer}.4";
+  minVer = "2.24";
 
-  src = fetchurlGnome {
-    project = "gnome-vfs";
-    major = "2"; minor = "24"; patchlevel = "4";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-vfs/${minVer}/${name}.tar.bz2";
     sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
index 4ce51844a51e..bf09bd93eebc 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurlGnome, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
+{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gtkglextmm-${minVer}.0";
+  minVer = "1.2";
 
-  src = fetchurlGnome {
-    project = "gtkglextmm";
-    major = "1"; minor = "2"; patchlevel = "0"; extension = "bz2";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2";
     sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
index 73b4fb9cc499..1fc780026064 100644
--- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, gettext}:
+{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext}:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "libIDL-${minVer}.14";
+  minVer = "0.8";
 
-  src = fetchurlGnome {
-    project = "libIDL";
-    major = "0"; minor = "8"; patchlevel = "14";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libIDL/${minVer}/${name}.tar.bz2";
     sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index d9867f25a4c1..add013e64cdb 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
+{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
 , intltool, ORBit2, procps }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "libbonobo";
-    major = "2"; minor = "32"; patchlevel = "1";
+  name = "libbonobo-${minVer}.1";
+  minVer = "2.32";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libbonobo/${minVer}/${name}.tar.bz2";
     sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index 00a0c4763a16..efdc28aac424 100644
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurlGnome, bison, pkgconfig, popt, libxml2, gtk, libtool
+{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk, libtool
 , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "libbonoboui";
-    major = "2"; minor = "24"; patchlevel = "5";
+  name = "libbonoboui-${minVer}.5";
+  minVer = "2.24";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libbonoboui/${minVer}/${name}.tar.bz2";
     sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index edcd868b2f31..4612e6aee6f5 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurlGnome, pkgconfig, glib, popt, zlib, libcanberra
+{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra
 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg
 }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "libgnome-${minVer}.1";
+  minVer = "2.32";
 
-  src = fetchurlGnome {
-    project = "libgnome";
-    major = "2"; minor = "32"; patchlevel = "1";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnome/${minVer}/${name}.tar.bz2";
     sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index 8a1b7706409f..8c12754f112b 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurlGnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
+{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "libgnomecanvas";
-    major = "2"; minor = "30"; patchlevel = "3";
+  name = "libgnomecanvas-${minVer}.3";
+  minVer = "2.30";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomecanvas/${minVer}/${name}.tar.bz2";
     sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
   };
-  
+
   buildInputs = [ libglade ];
   nativeBuildInputs = [ pkgconfig intltool ];
   propagatedBuildInputs = [ libart_lgpl gtk ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index 125a45072753..d230d19d5886 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurlGnome, pkgconfig, libxml2, xlibs, glib, pango
+{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango
 , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
 , gnome_vfs, libgnome_keyring, libglade }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "libgnomeui";
-    major = "2"; minor = "24"; patchlevel = "5";
+  name = "libgnomeui-${minVer}.5";
+  minVer = "2.24";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomeui/${minVer}/${name}.tar.bz2";
     sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
   };
-  
+
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs =
     [ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ];
diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
index 8a89425a6963..5779b6d04802 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk";
   };
 
-  buildInputs = [ pkgconfig atk cairo glib gtk3 pango
+  propagatedBuildInputs = [ gtk3 ];
+
+  buildInputs = [ pkgconfig atk cairo glib pango
                   libxml2Python perl intltool gettext ];
 
   preBuild = ''
diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
index e5f6a0aa9b8b..1875c1491f96 100644
--- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libxml2 glib ];
 
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
index 13ea6bb391cf..f3de70e10a15 100644
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/"
+    sed -i -e 's,glib/poppler.h,poppler.h,' src/tracker-extract/tracker-extract-pdf.c
   '';
   
   buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
index f0811d335a73..7436b6112d57 100644
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
@@ -1,13 +1,16 @@
---- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
-+++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000
-@@ -36,6 +36,10 @@
- set (CMAKE_SKIP_BUILD_RPATH FALSE)
- set (CMAKE_SKIP_RPATH FALSE)
-
+diff -Naur smokegen-4.14.3-upstream/CMakeLists.txt smokegen-4.14.3/CMakeLists.txt
+--- smokegen-4.14.3-upstream/CMakeLists.txt	2014-09-15 13:23:01.000000000 -0430
++++ smokegen-4.14.3/CMakeLists.txt	2015-03-29 16:41:59.295598992 -0430
+@@ -32,9 +32,9 @@
+     type.cpp
+ )
+ 
+-# force RPATH so that the binary is usable from within the build tree
+-set (CMAKE_SKIP_BUILD_RPATH FALSE)
+-set (CMAKE_SKIP_RPATH FALSE)
 +# add the automatically determined parts of the RPATH
 +# which point to directories outside the build tree to the install RPATH
-+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+
++set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
  configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
-
- add_executable(smokegen ${generator_SRC})
\ No newline at end of file
+ 
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix
index 092833388a78..de7b77999936 100644
--- a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix
+++ b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix
@@ -1,11 +1,11 @@
-{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
+{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, poppler_qt4, qca2
 , qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
 
 kde {
 
 # TODO: package activeapp, qmobipocket
 
-  buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4
+  buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre poppler_qt4
                   qca2 qimageblitz libtiff kactivities libkexiv2 ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
index 48f535549ce9..6068516ba2b2 100644
--- a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
+++ b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
@@ -1,8 +1,8 @@
-{ stdenv, kde, kdelibs, pkgconfig, doxygen, popplerQt4, taglib, exiv2, ffmpeg }:
+{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }:
 
 kde {
   buildInputs = [
-    kdelibs popplerQt4 taglib exiv2 ffmpeg
+    kdelibs poppler_qt4 taglib exiv2 ffmpeg
   ];
 
   nativeBuildInputs = [ pkgconfig doxygen ];
diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
index d90e1455ce99..526ac069e619 100644
--- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
+++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
@@ -1,4 +1,4 @@
-{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
+{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4
 , pkgconfig, doxygen, ebook_tools
 }:
 
@@ -8,7 +8,7 @@ kde {
 
   buildInputs = [
     kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
-    popplerQt4 ebook_tools
+    poppler_qt4 ebook_tools
   ];
 
   nativeBuildInputs = [ pkgconfig doxygen ];
diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix
index 0b70e816c207..d399c64afae4 100644
--- a/pkgs/desktops/plasma-5.2/default.nix
+++ b/pkgs/desktops/plasma-5.2/default.nix
@@ -38,7 +38,7 @@ let
     {
       LibBlueDevil = pkgs.libbluedevil;
       PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
-      PopplerQt5 = (pkgs.poppler.override { inherit qt5; }).poppler_qt5;
+      PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; };
     } //
     # packages from nixpkgs
     (with pkgs;