diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix | 24 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch | 15 |
2 files changed, 20 insertions, 19 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 100d270673fc..99b00e6ca9d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , meson +, nasm , ninja , pkgconfig , python3 @@ -29,40 +30,45 @@ , mpg123 , twolame , gtkSupport ? false, gtk3 ? null +, raspiCameraSupport ? false, libraspberrypi ? null , enableJack ? true, libjack2 , libXdamage , libXext , libXfixes , ncurses +, wayland +, wayland-protocols , xorg , libgudev , wavpack }: assert gtkSupport -> gtk3 != null; +assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64); let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.16.2"; + version = "1.18.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0"; + sha256 = "0v329xi4qhlfh9aksfyviryqk9lclm4wj1lxrjnbdv4haldfj472"; }; - patches = [ ./fix_pkgconfig_includedir.patch ]; - nativeBuildInputs = [ pkgconfig python3 meson ninja gettext + nasm + ] ++ optionals stdenv.isLinux [ + wayland-protocols ]; buildInputs = [ @@ -91,6 +97,8 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXdamage wavpack + ] ++ optionals raspiCameraSupport [ + libraspberrypi ] ++ optionals gtkSupport [ # for gtksink gtk3 @@ -102,12 +110,14 @@ stdenv.mkDerivation rec { libavc1394 libiec61883 libgudev + wayland ] ++ optionals enableJack [ libjack2 ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps ] ++ optionals (!gtkSupport) [ "-Dgtk3=disabled" @@ -122,8 +132,14 @@ stdenv.mkDerivation rec { "-Dv4l2=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only "-Dpulse=disabled" # TODO check if we can keep this enabled + ] ++ optionals (!raspiCameraSupport) [ + "-Drpicamsrc=disabled" ]; + postPatch = '' + patchShebangs \ + scripts/extract-release-date-from-doap-file.py + ''; NIX_LDFLAGS = [ # linking error on Darwin diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch deleted file mode 100644 index f68ad603a37c..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index b3bf0d4d4..3e6e576c0 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - |