From 96d78a2804ada185f6bb4dc2b51f15853598e251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 22 Mar 2014 23:57:24 +0800 Subject: [PATCH] pitivi: fix icons --- pkgs/applications/video/pitivi/default.nix | 8 +++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index d6a0c0e5212d..947d2517808a 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper , pythonPackages, gst, clutter-gst, clutter-gtk , gobjectIntrospection, clutter, gtk3, librsvg +, gnome_icon_theme, gnome_icon_theme_symbolic }: let @@ -43,10 +44,15 @@ in stdenv.mkDerivation rec { gstreamer gst-editing-services clutter-gst clutter-gtk clutter gtk3 ]; + + xdgDataDirs = makeSearchPath "share" [ + gtk3 gnome_icon_theme gnome_icon_theme_symbolic + ]; in '' wrapProgram "$out/bin/pitivi" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix LD_LIBRARY_PATH : "${libraryPath}" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:${xdgDataDirs}:$out/share" ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dad2bf5056a1..c7ba7f800a55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1633,6 +1633,7 @@ let pitivi = callPackage ../applications/video/pitivi { gst = gst_all_1; clutter-gtk = clutter_gtk; + inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic; }; hurdPartedCross =