public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Update libglade to a version that builds with current gtk. We

Browse Source 
should update all of Gnome at some point...

svn path=/nixpkgs/branches/stdenv-updates/; revision=11853
This commit is contained in:
Eelco Dolstra 2008-05-20 09:36:55 +00:00
parent 32a4d08be3
commit c21a987841
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix
View File

@ -114,10 +114,10 @@
}; };
}; };
libglade = { libglade = {
name = "libglade-2.6.0"; name = "libglade-2.6.2";
src = fetchurl { src = fetchurl {
url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libglade-2.6.0.tar.bz2; url = http://ftp.acc.umu.se/pub/GNOME/sources/libglade/2.6/libglade-2.6.2.tar.bz2;
md5 = "81d7b2b64871ce23a5fae1e5da0b1f6e"; md5 = "da4f9d1c6cd1337f6ef5e2db768d8557";
}; };
}; };
libgnome = { libgnome = {

11
pkgs/desktops/kde/kdebase/default.nix
View File

@ -5,7 +5,7 @@
let version = "3.5.7"; in let version = "3.5.7"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdebase-3.5.7"; name = "kdebase-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2"; url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2";
@ -21,15 +21,18 @@ stdenv.mkDerivation {
xlibs.scrnsaverproto xlibs.libXScrnSaver xlibs.scrnsaverproto xlibs.libXScrnSaver
]; ];
configureFlags = " configureFlags = ''
--without-arts --without-arts
--with-ssl-dir=${openssl} --with-ssl-dir=${openssl}
--with-extra-includes=${libjpeg}/include --with-extra-includes=${libjpeg}/include
"; '';
# Quick hack to work around a faulty dependency in # Quick hack to work around a faulty dependency in
# konqueror/keditbookmarks/Makefile.am (${includedir} should be # konqueror/keditbookmarks/Makefile.am (${includedir} should be
# ${kdelibs} or so). # ${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"; postInstall = "rm $out/include/kbookmarknotifier.h";
} }

8
pkgs/desktops/kde/kdelibs/default.nix
View File

@ -3,14 +3,14 @@
, freetype, bzip2, cups , freetype, bzip2, cups
}: }:
let version = "3.5.7"; in let version = "3.5.9"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdelibs-${version}"; name = "kdelibs-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2"; url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
md5 = "50ed644f2ec91963570fe2b155652957"; md5 = "55e5f00874933d1a7ba7c95e369a205e";
}; };
passthru = {inherit openssl libX11 libjpeg qt;}; passthru = {inherit openssl libX11 libjpeg qt;};
@ -21,11 +21,11 @@ stdenv.mkDerivation {
libtool freetype bzip2 cups libtool freetype bzip2 cups
]; ];
configureFlags = " configureFlags = ''
--without-arts --without-arts
--with-ssl-dir=${openssl} --with-ssl-dir=${openssl}
--with-extra-includes=${libjpeg}/include --with-extra-includes=${libjpeg}/include
--x-includes=${libX11}/include --x-includes=${libX11}/include
--x-libraries=${libX11}/lib --x-libraries=${libX11}/lib
"; '';
} }