swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

pitivi: 0.94 -> 0.95

Browse source 
Notable (hard) dependency changes:
  - gstreamer >= 1.6.0
  - gst-plugins-bad with GTK support (need "gstgtk" plugin)
  - pygobject >= 3.14
  - gst-validate
  - matplotlib (used for drawing the "timeline")

Changes v1 -> v2:
pitivi no longer requires clutter, so I switched clutter-gtk => gtk3.
This commit is contained in:
Bjørn Forsman 2015-12-04 12:22:07 +01:00
parent aad87c4cd0
commit 1eaf571d42
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/video/pitivi/default.nix
View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper
, python3Packages, gst, clutter-gtk, hicolor_icon_theme , python3Packages, gst, gtk3, hicolor_icon_theme
, gobjectIntrospection, librsvg, gnome3, libnotify , gobjectIntrospection, librsvg, gnome3, libnotify
}: }:
let let
version = "0.94"; version = "0.95";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "pitivi-${version}"; name = "pitivi-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz"; url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz";
sha256 = "1v7s0qsibwykkmknspjhpdrj80s987pvbl01kh34k4aspi1hcapm"; sha256 = "04ykw619aikhxk5wj7z44pvwl52053d1kamcxpscw0ixrh5j45az";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -29,15 +29,15 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ];
buildInputs = [ buildInputs = [
gobjectIntrospection clutter-gtk librsvg gnome3.gnome_desktop gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop
gnome3.defaultIconTheme gnome3.defaultIconTheme
gnome3.gsettings_desktop_schemas libnotify gnome3.gsettings_desktop_schemas libnotify
] ++ (with gst; [ ] ++ (with gst; [
gstreamer gst-editing-services gstreamer 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 gst-validate
]) ++ (with python3Packages; [ ]) ++ (with python3Packages; [
python pygobject3 gst-python pyxdg numpy pycairo sqlite3 python pygobject3 gst-python pyxdg numpy pycairo sqlite3 matplotlib
]); ]);
preFixup = '' preFixup = ''

6
pkgs/top-level/all-packages.nix
View file

@ -2619,8 +2619,10 @@ let
parted = callPackage ../tools/misc/parted { hurd = null; }; parted = callPackage ../tools/misc/parted { hurd = null; };
pitivi = callPackage ../applications/video/pitivi { pitivi = callPackage ../applications/video/pitivi {
gst = gst_all_1; gst = gst_all_1 //
clutter-gtk = clutter_gtk; { gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation
(attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; });
};
}; };
p0f = callPackage ../tools/security/p0f { }; p0f = callPackage ../tools/security/p0f { };