From 8b3b208f3380a1c7c5524d2f170dd2714832588a Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 9 Apr 2013 09:26:31 +0400 Subject: [PATCH] wicd: rename icons/hicolour to icons/hicolor --- pkgs/tools/networking/wicd/default.nix | 2 +- pkgs/tools/networking/wicd/fix-app-icon.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index ff3df9efb745..0297ab295910 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --systemd=$out/lib/systemd/ \ --logrotate=$out/etc/logrotate.d/ \ --desktop=$out/share/applications/ \ - --icons=$out/share/icons/hicolour/ \ + --icons=$out/share/icons/hicolor/ \ --translations=$out/share/locale/ \ --autostart=$out/etc/xdg/autostart/ \ --varlib=$out/var/lib/ \ diff --git a/pkgs/tools/networking/wicd/fix-app-icon.patch b/pkgs/tools/networking/wicd/fix-app-icon.patch index 154d7da35108..31b47bb45881 100644 --- a/pkgs/tools/networking/wicd/fix-app-icon.patch +++ b/pkgs/tools/networking/wicd/fix-app-icon.patch @@ -10,9 +10,9 @@ diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py - if os.path.exists(os.path.join(wpath.images, "wicd.png")): - self.window.set_icon_from_file(os.path.join(wpath.images, "wicd.png")) + if os.path.exists(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")): -+ self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")) ++ self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png")) + else: -+ print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png") ++ print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png") self.statusID = None self.first_dialog_load = True self.is_visible = True