From a3d6b0a4b1934b82e799b13e47cc3950930b6f97 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Sep 2018 17:17:53 +0200
Subject: [PATCH] =?UTF-8?q?pitivi:=200.99.0=20=E2=86=92=200.999.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/video/pitivi/default.nix | 25 +++++++++++-----------
 pkgs/top-level/all-packages.nix            | 11 +---------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 57ee1cf1275..7ce1aa67708 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
-, python3Packages, gst, gtk3
+{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
+, python3Packages, gst_all_1, gtk3
 , gobjectIntrospection, librsvg, gnome3, libnotify
 , meson, ninja
 }:
 
 let
-  version = "0.99";
+  version = "0.999";
 
   # 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
   # don't bother exposing the package to all of nixpkgs.
   gst-transcoder = stdenv.mkDerivation rec {
-    version = "1.12.2";
+    version = "1.14.1";
     name = "gst-transcoder-${version}";
-    src = fetchurl {
-      name = "${name}.tar.gz";
-      url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz";
-      sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9";
+    src = fetchFromGitHub {
+      owner = "pitivi";
+      repo = "gst-transcoder";
+      rev = version;
+      sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f";
     };
-    nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ];
-    buildInputs = with gst; [ gstreamer gst-plugins-base ];
+    nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection python3 ];
+    buildInputs = with gst_all_1; [ gstreamer gst-plugins-base ];
   };
 
 in python3Packages.buildPythonApplication rec {
@@ -27,7 +28,7 @@ in python3Packages.buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69";
+    sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb";
   };
 
   format = "other";
@@ -50,7 +51,7 @@ in python3Packages.buildPythonApplication rec {
     gnome3.defaultIconTheme
     gnome3.gsettings-desktop-schemas libnotify
     gst-transcoder
-  ] ++ (with gst; [
+  ] ++ (with gst_all_1; [
     gstreamer gst-editing-services
     gst-plugins-base (gst-plugins-good.override { gtkSupport = true; })
     gst-plugins-bad gst-plugins-ugly gst-libav gst-validate
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9775212f83..7104065b7d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4714,16 +4714,7 @@ with pkgs;
 
   pick = callPackage ../tools/misc/pick { };
 
-  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" ];
-                  });
-      };
-  };
+  pitivi = callPackage ../applications/video/pitivi { };
 
   pulumi-bin = callPackage ../tools/admin/pulumi { };