diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-04 21:44:01 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-04 21:44:01 +0000 |
commit | ac4d1830517e8e6595752f62118502aed465ea42 (patch) | |
tree | 0df8871b20f3bcd85a1419fdf69056153c0eb4ba /pkgs | |
parent | 7a233c16294b8f2a0c0469e2402f72f1f74822b8 (diff) | |
download | nixlib-ac4d1830517e8e6595752f62118502aed465ea42.tar nixlib-ac4d1830517e8e6595752f62118502aed465ea42.tar.gz nixlib-ac4d1830517e8e6595752f62118502aed465ea42.tar.bz2 nixlib-ac4d1830517e8e6595752f62118502aed465ea42.tar.lz nixlib-ac4d1830517e8e6595752f62118502aed465ea42.tar.xz nixlib-ac4d1830517e8e6595752f62118502aed465ea42.tar.zst nixlib-ac4d1830517e8e6595752f62118502aed465ea42.zip |
* Added gnome-icon-theme.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18118
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/evince/default.nix | 12 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2.28/default.nix | 21 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/tools/misc/icon-naming-utils/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 50 insertions, 22 deletions
diff --git a/pkgs/applications/misc/evince/default.nix b/pkgs/applications/misc/evince/default.nix index 837930738e85..986825426135 100644 --- a/pkgs/applications/misc/evince/default.nix +++ b/pkgs/applications/misc/evince/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, perl, perlXMLParser, gettext, intltool , pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme , libgnome, libgnomeui, scrollkeeper, libxslt -, libglade, dbus, dbus_glib +, libglade, gnome_keyring, dbus, dbus_glib , poppler, libspectre, djvulibre, shared_mime_info , makeWrapper, which , recentListSize ? null # 5 is not enough, allow passing a different number @@ -16,13 +16,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl perlXMLParser gettext intltool - pkgconfig glib gtk gnomedocutils gnomeicontheme - libgnome libgnomeui libglade scrollkeeper + perl perlXMLParser gettext intltool pkgconfig glib gtk + gnomedocutils gnomeicontheme libgnome libgnomeui libglade + scrollkeeper gnome_keyring libxslt # for `xsltproc' - dbus dbus_glib - poppler libspectre djvulibre - makeWrapper which + dbus dbus_glib poppler libspectre djvulibre makeWrapper which ]; configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf " diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 4d0fc9f2b7d7..ef08afbf7382 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -7,6 +7,15 @@ rec { # Backward compatibility. gnomevfs = gnome_vfs; startupnotification = startup_notification; + gnomedocutils = gnome_doc_utils; + gnomeicontheme = gnome_icon_theme; + + # !!! Missing! Need to add these. + libgnomeprint = throw "libgnomeprint not implemented"; + libgtkhtml = throw "libgtkhtml not implemented"; + vte = throw "vte not implemented"; + libglademm = throw "libglademm not implemented"; + gtksourceview_24 = gtksourceview; #### PLATFORM @@ -129,6 +138,11 @@ rec { inherit (pkgs.gtkLibs) gtk; }; + gtkglext = import ./platform/gtkglext { + inherit (pkgs) stdenv fetchurl mesa pkgconfig; + inherit (pkgs.gtkLibs) gtk pango; + }; + #### DESKTOP gnome_keyring = import ./desktop/gnome-keyring { @@ -264,8 +278,9 @@ rec { inherit gnome_desktop libunique intltool GConf; }; - gtkglext = import ./platform/gtkglext { - inherit (pkgs) stdenv fetchurl mesa pkgconfig; - inherit (pkgs.gtkLibs) gtk pango; + gnome_icon_theme = import ./desktop/gnome-icon-theme { + inherit (pkgs) stdenv fetchurl pkgconfig intltool iconnamingutils; + #inherit (pkgs.gtkLibs) gtk pango; }; + } diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix new file mode 100644 index 000000000000..22aeb8a0f59f --- /dev/null +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils }: + +stdenv.mkDerivation rec { + name = "gnome-icon-theme-2.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-icon-theme/2.28/${name}.tar.bz2"; + sha256 = "111q1yijm8mjvz600nfa49gbjz4988vpfv74jcknfng0k92vvv1i"; + }; + + buildInputs = [ pkgconfig intltool iconnamingutils ]; +} diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index be1bc9691c8e..7a03eb7b1280 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -1,20 +1,23 @@ {stdenv, fetchurl, perl, XMLSimple}: -stdenv.mkDerivation { - name = "icon-naming-utils-0.8.7"; +stdenv.mkDerivation rec { + name = "icon-naming-utils-0.8.90"; src = fetchurl { - url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz; - sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w"; + url = "http://tango.freedesktop.org/releases/${name}.tar.gz"; + sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4"; }; buildInputs = [perl XMLSimple]; - postInstall = " - # Add XML::Simple to the runtime search path. - substituteInPlace $out/libexec/icon-name-mapping \\ - --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl'; - ensureDir $out/lib - ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF? - "; + postInstall = + '' + # Add XML::Simple to the runtime search path. + substituteInPlace $out/libexec/icon-name-mapping \ + --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl' + ''; + + meta = { + homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4e600d00051..6d0471ab98b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6888,7 +6888,7 @@ let pkgconfig poppler libspectre djvulibre libxslt dbus dbus_glib shared_mime_info which makeWrapper; inherit (gnome) gnomedocutils gnomeicontheme libgnome - libgnomeui libglade glib gtk scrollkeeper; + libgnomeui libglade glib gtk scrollkeeper gnome_keyring; }; exrdisplay = import ../applications/graphics/exrdisplay { |