pitivi: cleanup and fix icons on non-nixos

1 files changed, 9 insertions, 15 deletions

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 7f53aa07db60..5b77ec916b08 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper
-, pythonPackages, gst, clutter-gst, clutter-gtk
-, gobjectIntrospection, clutter, gtk3, librsvg
-, gnome_icon_theme, gnome_icon_theme_symbolic, gnome3
+, pythonPackages, gst, clutter-gst, clutter-gtk, hicolor_icon_theme
+, gobjectIntrospection, clutter, gtk3, librsvg, gnome3, libnotify
 }:
 
 let
@@ -30,27 +29,22 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ];
 
   buildInputs = [
-    gobjectIntrospection clutter-gst clutter-gtk librsvg
+    gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop
+    hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
+    gnome3.gsettings_desktop_schemas libnotify
   ] ++ (with gst; [
-    gst-python gst-editing-services
+    gstreamer gst-python gst-editing-services
     gst-plugins-base gst-plugins-good
     gst-plugins-bad gst-plugins-ugly gst-libav
   ]) ++ (with pythonPackages; [
     python pygobject3 pyxdg numpy pycairo sqlite3
   ]);
 
-  preFixup = with stdenv.lib; with gst; let
-    libraryPath = makeLibraryPath [
-      gstreamer gst-editing-services
-      clutter-gst clutter-gtk clutter gtk3
-      gnome3.gnome_desktop
-    ];
-  in ''
+  preFixup = ''
     wrapProgram "$out/bin/pitivi" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix LD_LIBRARY_PATH : "${libraryPath}" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    rm $out/share/icons/hicolor/icon-theme.cache
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 }