diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix b/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix index d53ae9807392..28c458ea7dfa 100644 --- a/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix +++ b/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix @@ -114,10 +114,10 @@ }; }; libglade = { - name = "libglade-2.6.0"; + name = "libglade-2.6.2"; src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libglade-2.6.0.tar.bz2; - md5 = "81d7b2b64871ce23a5fae1e5da0b1f6e"; + url = http://ftp.acc.umu.se/pub/GNOME/sources/libglade/2.6/libglade-2.6.2.tar.bz2; + md5 = "da4f9d1c6cd1337f6ef5e2db768d8557"; }; }; libgnome = { diff --git a/pkgs/desktops/kde/kdebase/default.nix b/pkgs/desktops/kde/kdebase/default.nix index 77dc9889995a..4ca1a4f2dc2e 100644 --- a/pkgs/desktops/kde/kdebase/default.nix +++ b/pkgs/desktops/kde/kdebase/default.nix @@ -5,7 +5,7 @@ let version = "3.5.7"; in stdenv.mkDerivation { - name = "kdebase-3.5.7"; + name = "kdebase-${version}"; src = fetchurl { url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2"; @@ -21,15 +21,18 @@ stdenv.mkDerivation { xlibs.scrnsaverproto xlibs.libXScrnSaver ]; - configureFlags = " + configureFlags = '' --without-arts --with-ssl-dir=${openssl} --with-extra-includes=${libjpeg}/include - "; + ''; # Quick hack to work around a faulty dependency in # konqueror/keditbookmarks/Makefile.am (${includedir} should be # ${kdelibs} or so). - preBuild = "ensureDir $out/include; ln -s ${kdelibs}/include/kbookmarknotifier.h $out/include/"; + preBuild = '' + ensureDir $out/include + ln -s ${kdelibs}/include/kbookmarknotifier.h $out/include/ + ''; postInstall = "rm $out/include/kbookmarknotifier.h"; } diff --git a/pkgs/desktops/kde/kdelibs/default.nix b/pkgs/desktops/kde/kdelibs/default.nix index 9eb6625d45aa..3e048aa932d5 100644 --- a/pkgs/desktops/kde/kdelibs/default.nix +++ b/pkgs/desktops/kde/kdelibs/default.nix @@ -3,14 +3,14 @@ , freetype, bzip2, cups }: -let version = "3.5.7"; in +let version = "3.5.9"; in stdenv.mkDerivation { name = "kdelibs-${version}"; src = fetchurl { url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2"; - md5 = "50ed644f2ec91963570fe2b155652957"; + md5 = "55e5f00874933d1a7ba7c95e369a205e"; }; passthru = {inherit openssl libX11 libjpeg qt;}; @@ -21,11 +21,11 @@ stdenv.mkDerivation { libtool freetype bzip2 cups ]; - configureFlags = " + configureFlags = '' --without-arts --with-ssl-dir=${openssl} --with-extra-includes=${libjpeg}/include --x-includes=${libX11}/include --x-libraries=${libX11}/lib - "; + ''; }