diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 6ec5e5d9e0a5..7d349f31e044 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -13,8 +13,6 @@ rec { gst-libav = callPackage ./libav { inherit gst-plugins-base; }; - gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; }; - gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; gst-editing-services = callPackage ./ges { inherit gnonlin; }; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index a91b5d81bb32..c1b94a647b88 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer - , gst-plugins-base, pygtk, pygobject3 +{ fetchurl, stdenv, pkgconfig, python +, gst-plugins-base, pygobject3 +, ncurses }: stdenv.mkDerivation rec { @@ -15,15 +16,16 @@ stdenv.mkDerivation rec { patches = [ ./different-path-with-pygobject.patch ]; - buildInputs = - [ pkgconfig gst-plugins-base pygtk pygobject3 ] - ; + nativeBuildInputs = [ pkgconfig python ]; + + # XXX: in the Libs.private field of python3.pc + buildInputs = [ ncurses ]; preConfigure = '' export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides" ''; - propagatedBuildInputs = [ gstreamer python ]; + propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; meta = { homepage = http://gstreamer.freedesktop.org; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a87e71bbfcb0..766426143300 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3758,6 +3758,10 @@ let propagatedBuildInputs = with self; [ gdata ]; }; + gst-python = callPackage ../development/libraries/gstreamer/python { + gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; + }; + gtimelog = buildPythonPackage rec { name = "gtimelog-${version}"; version = "0.9.1";