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

pitivi: 0.99.0 → 0.999.0

Browse Source
This commit is contained in:
Jan Tojnar 2018-09-08 17:17:53 +02:00
parent e09e735a09
commit a3d6b0a4b1
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,25 +1,26 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
, python3Packages, gst, gtk3 , python3Packages, gst_all_1, gtk3
, gobjectIntrospection, librsvg, gnome3, libnotify , gobjectIntrospection, librsvg, gnome3, libnotify
, meson, ninja , meson, ninja
}: }:
let let
version = "0.99"; version = "0.999";
# gst-transcoder will eventually be merged with gstreamer (according to # gst-transcoder will eventually be merged with gstreamer (according to
# gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we
# don't bother exposing the package to all of nixpkgs. # don't bother exposing the package to all of nixpkgs.
gst-transcoder = stdenv.mkDerivation rec { gst-transcoder = stdenv.mkDerivation rec {
version = "1.12.2"; version = "1.14.1";
name = "gst-transcoder-${version}"; name = "gst-transcoder-${version}";
src = fetchurl { src = fetchFromGitHub {
name = "${name}.tar.gz"; owner = "pitivi";
url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz"; repo = "gst-transcoder";
sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9"; rev = version;
sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f";
}; };
nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection python3 ];
buildInputs = with gst; [ gstreamer gst-plugins-base ]; buildInputs = with gst_all_1; [ gstreamer gst-plugins-base ];
}; };
in python3Packages.buildPythonApplication rec { in python3Packages.buildPythonApplication rec {
@ -27,7 +28,7 @@ in python3Packages.buildPythonApplication rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69"; sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb";
}; };
format = "other"; format = "other";
@ -50,7 +51,7 @@ in python3Packages.buildPythonApplication rec {
gnome3.defaultIconTheme gnome3.defaultIconTheme
gnome3.gsettings-desktop-schemas libnotify gnome3.gsettings-desktop-schemas libnotify
gst-transcoder gst-transcoder
] ++ (with gst; [ ] ++ (with gst_all_1; [
gstreamer gst-editing-services gstreamer gst-editing-services
gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-base (gst-plugins-good.override { gtkSupport = true; })
gst-plugins-bad gst-plugins-ugly gst-libav gst-validate gst-plugins-bad gst-plugins-ugly gst-libav gst-validate

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

@ -4714,16 +4714,7 @@ with pkgs;
pick = callPackage ../tools/misc/pick { }; pick = callPackage ../tools/misc/pick { };
pitivi = callPackage ../applications/video/pitivi { pitivi = callPackage ../applications/video/pitivi { };
gst = gst_all_1 //
{ gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation
(attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ];
# Fix this build error in ./tests/examples/waylandsink:
# main.c:28:2: error: #error "Wayland is not supported in GTK+"
configureFlags = attrs.configureFlags or [] ++ [ "--enable-wayland=no" ];
});
};
};
pulumi-bin = callPackage ../tools/admin/pulumi { }; pulumi-bin = callPackage ../tools/admin/pulumi { };