summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-04-04 18:34:40 +0200
committerGitHub <noreply@github.com>2018-04-04 18:34:40 +0200
commitc490b0550715ca0b76258c27ccf4b24b85b7fb87 (patch)
tree4e46731791c52785421cbb3a9bbeebafa8420dbe /pkgs/development/python-modules
parenta4581f521dac24e44e83def0335457e3caba7e04 (diff)
parent853a086b6a5bcc522e65405bd799649239f2ad59 (diff)
downloadnixlib-c490b0550715ca0b76258c27ccf4b24b85b7fb87.tar
nixlib-c490b0550715ca0b76258c27ccf4b24b85b7fb87.tar.gz
nixlib-c490b0550715ca0b76258c27ccf4b24b85b7fb87.tar.bz2
nixlib-c490b0550715ca0b76258c27ccf4b24b85b7fb87.tar.lz
nixlib-c490b0550715ca0b76258c27ccf4b24b85b7fb87.tar.xz
nixlib-c490b0550715ca0b76258c27ccf4b24b85b7fb87.tar.zst
nixlib-c490b0550715ca0b76258c27ccf4b24b85b7fb87.zip
Merge pull request #38149 from bkchr/gst_1_14_0
Updates gstreamer and plugins to 1.14.0
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/gst-python/default.nix19
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 393d00a8176a..b1d19e9f5091 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -1,10 +1,10 @@
-{ fetchurl, stdenv, pkgconfig, python, pygobject3
+{ fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3
 , gst-plugins-base, ncurses
 }:
 
 stdenv.mkDerivation rec {
   pname = "gst-python";
-  version = "1.12.3";
+  version = "1.14.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -12,22 +12,25 @@ stdenv.mkDerivation rec {
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "19rb06x2m7103zwfm0plxx95gb8bp01ng04h4q9k6ii9q7g2kxf3";
+    sha256 = "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0";
   };
 
-  patches = [ ./different-path-with-pygobject.patch ];
-
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig python ];
+  nativeBuildInputs = [ meson ninja pkgconfig python ];
 
   # XXX: in the Libs.private field of python3.pc
   buildInputs = [ ncurses ];
 
-  configureFlags = [
-    "--with-pygi-overrides-dir=$(out)/${python.sitePackages}/gi/overrides"
+  mesonFlags = [
+    "-Dpygi-overrides-dir=${python.sitePackages}/gi/overrides"
   ];
 
+  postPatch = ''
+    chmod +x scripts/pythondetector # patchShebangs requires executable file
+    patchShebangs scripts/pythondetector
+  '';
+
   propagatedBuildInputs = [ gst-plugins-base pygobject3 ];
 
   # Needed for python.buildEnv