about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-12-14 02:47:16 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-12-14 02:47:16 +0100
commit9c18e1fbe712f5abd4602813f57d6c52a77942be (patch)
tree39b5b5fb541bce6ead78a07480a57484cdd2b5ba
parent109411346421765eebc24dfa7aa93946fbf67444 (diff)
farstream: remove python2 dependency
It was never used in the recent history.
-rw-r--r--pkgs/development/libraries/farstream/default.nix20
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 952c85ccdac62..763caa811e345 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,11 +1,11 @@
 { stdenv
 , fetchurl
+, fetchpatch
 , libnice
 , pkgconfig
-, pythonPackages
+, autoreconfHook
 , gstreamer
 , gst-plugins-base
-, gst-python
 , gupnp-igd
 , gobject-introspection
 , gst-plugins-good
@@ -13,9 +13,7 @@
 , gst-libav
 }:
 
-let
-  inherit (pythonPackages) python pygobject2;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "farstream-0.2.8";
 
   outputs = [ "out" "dev" ];
@@ -25,23 +23,29 @@ in stdenv.mkDerivation rec {
     sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";
   };
 
+  patches = [
+    # Python has not been used for ages
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch";
+      sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn";
+    })
+  ];
+
   buildInputs = [
     libnice
-    python
-    pygobject2
     gupnp-igd
     libnice
   ];
 
   nativeBuildInputs = [
     pkgconfig
+    autoreconfHook
     gobject-introspection
   ];
 
   propagatedBuildInputs = [
     gstreamer
     gst-plugins-base
-    gst-python
     gst-plugins-good
     gst-plugins-bad
     gst-libav
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9723662a052d4..b9a69a830bae8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11133,7 +11133,6 @@ in
     inherit (gst_all_1)
       gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
       gst-libav;
-    inherit (pythonPackages) gst-python;
   };
 
   fcgi = callPackage ../development/libraries/fcgi { };