diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-04-16 09:36:36 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-04-16 09:37:48 +0200 |
commit | 883780bd81c3bb4626f444a33b7ac41c0a4d155c (patch) | |
tree | 6a4382dba738ca82d10647afd79a0bd3da93672d | |
parent | d4ae355559ec66d1ee036ce91fd2a81720d5ca00 (diff) | |
parent | 8bbb9ca13d1ecd1ff7ba7e7e237870b2c6467cdc (diff) | |
download | nixpkgs-883780bd81c3bb4626f444a33b7ac41c0a4d155c.tar nixpkgs-883780bd81c3bb4626f444a33b7ac41c0a4d155c.tar.gz nixpkgs-883780bd81c3bb4626f444a33b7ac41c0a4d155c.tar.bz2 nixpkgs-883780bd81c3bb4626f444a33b7ac41c0a4d155c.tar.lz nixpkgs-883780bd81c3bb4626f444a33b7ac41c0a4d155c.tar.xz nixpkgs-883780bd81c3bb4626f444a33b7ac41c0a4d155c.tar.zst nixpkgs-883780bd81c3bb4626f444a33b7ac41c0a4d155c.zip |
Merge #223248: gst-plugins-base: enable graphene + gstgl
on aarch64-darwin. Merge into staging
4 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 1d2ae340a80..ec31443dc44 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -92,6 +92,7 @@ , VideoToolbox , AudioToolbox , AVFoundation +, Cocoa , CoreMedia , CoreVideo , Foundation @@ -233,6 +234,7 @@ stdenv.mkDerivation rec { VideoToolbox AudioToolbox AVFoundation + Cocoa CoreMedia CoreVideo Foundation diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index e03f9f0b844..c7bec416c8d 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -7,6 +7,7 @@ , gettext , python3 , gstreamer +, graphene , orc , pango , libtheora @@ -27,10 +28,8 @@ , wayland-protocols , enableAlsa ? stdenv.isLinux , alsa-lib -# Enabling Cocoa seems to currently not work, giving compile -# errors. Suspected is that a newer version than clang -# is needed than 5.0 but it is not clear. -, enableCocoa ? false +# TODO: fix once x86_64-darwin sdk updated +, enableCocoa ? (stdenv.isDarwin && stdenv.isAarch64) , Cocoa , OpenGL , enableGl ? (enableX11 || enableWayland || enableCocoa) @@ -73,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gobject-introspection + graphene orc libtheora libintl @@ -105,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 9acad3fb624..0c550ef1164 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -24,7 +24,7 @@ gst-plugins-good = callPackage ./good { inherit Cocoa; }; - gst-plugins-bad = callPackage ./bad { inherit AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; + gst-plugins-bad = callPackage ./bad { inherit AudioToolbox AVFoundation Cocoa CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index d90abc0068d..a88024ec2f1 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { "-Dvulkan=enabled" ] ++ lib.optionals (!cupsSupport) [ "-Dprint-cups=disabled" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ "-Dmedia-gstreamer=disabled" # requires gstreamer-gl ] ++ lib.optionals (!x11Support) [ "-Dx11-backend=false" |