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

pitivi: cleanup and fix icons on non-nixos

Browse Source
This commit is contained in:
Luca Bruno 2015-03-23 11:24:17 +01:00
parent 12e60724ff
commit 4a1c3760e0
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/video/pitivi/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper
, pythonPackages, gst, clutter-gst, clutter-gtk , pythonPackages, gst, clutter-gst, clutter-gtk, hicolor_icon_theme
, gobjectIntrospection, clutter, gtk3, librsvg , gobjectIntrospection, clutter, gtk3, librsvg, gnome3, libnotify
, gnome_icon_theme, gnome_icon_theme_symbolic, gnome3
}: }:
let let
@ -30,27 +29,22 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ];
buildInputs = [ 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; [ ] ++ (with gst; [
gst-python gst-editing-services gstreamer gst-python gst-editing-services
gst-plugins-base gst-plugins-good gst-plugins-base gst-plugins-good
gst-plugins-bad gst-plugins-ugly gst-libav gst-plugins-bad gst-plugins-ugly gst-libav
]) ++ (with pythonPackages; [ ]) ++ (with pythonPackages; [
python pygobject3 pyxdg numpy pycairo sqlite3 python pygobject3 pyxdg numpy pycairo sqlite3
]); ]);
preFixup = with stdenv.lib; with gst; let preFixup = ''
libraryPath = makeLibraryPath [
gstreamer gst-editing-services
clutter-gst clutter-gtk clutter gtk3
gnome3.gnome_desktop
];
in ''
wrapProgram "$out/bin/pitivi" \ wrapProgram "$out/bin/pitivi" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --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 GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
''; '';
} }

1
pkgs/top-level/all-packages.nix
View File

@ -2293,7 +2293,6 @@ let
pitivi = callPackage ../applications/video/pitivi { pitivi = callPackage ../applications/video/pitivi {
gst = gst_all_1; gst = gst_all_1;
clutter-gtk = clutter_gtk; clutter-gtk = clutter_gtk;
inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic;
}; };
p0f = callPackage ../tools/security/p0f { }; p0f = callPackage ../tools/security/p0f { };