From 18fa507569ffa5cf71401d4e4b16ea8dbb14b735 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 26 Jun 2024 20:49:02 +0200 Subject: [PATCH 1/3] xevd: update broken platforms --- pkgs/by-name/xe/xevd/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xe/xevd/package.nix b/pkgs/by-name/xe/xevd/package.nix index df6566dff514..c25e5b6029c2 100644 --- a/pkgs/by-name/xe/xevd/package.nix +++ b/pkgs/by-name/xe/xevd/package.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "xevd" ]; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.all; - broken = !stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isDarwin; + # Currently only supports gcc and msvc as compiler, the limitation for clang gets removed in the next release, but that does not fix building on darwin. + broken = !stdenv.hostPlatform.isx86 || !stdenv.cc.isGNU; }; }) From f0b12dfafb139ceef06fe270d43854caddba230d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 26 Jun 2024 20:49:24 +0200 Subject: [PATCH 2/3] xeve: update broken platforms --- pkgs/by-name/xe/xeve/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xe/xeve/package.nix b/pkgs/by-name/xe/xeve/package.nix index efcc31e3905b..f8d44b4a2f1d 100644 --- a/pkgs/by-name/xe/xeve/package.nix +++ b/pkgs/by-name/xe/xeve/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xeve_app"; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.all; - broken = !stdenv.hostPlatform.isx86; + # Currently only supports gcc and msvc as compiler, the limitation for clang gets removed in the next release, but that does not fix building on darwin. + broken = !stdenv.hostPlatform.isx86 || !stdenv.cc.isGNU; }; }) From 6c65f6f138f7cd35f975904dfbb87f6625f47ab0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 26 Jun 2024 19:24:03 +0200 Subject: [PATCH 3/3] ffmpeg_7: fix darwin build --- pkgs/development/libraries/ffmpeg/generic.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7496cb4de0e7..afb6809ef402 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -39,7 +39,8 @@ , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering , withAudioToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple AudioToolbox -, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin # Apple AVFoundation framework +# Compiling ffmpeg 7 with AVFoundation on x86_64-darwin currently fails with "error: incompatible pointer to integer conversion passing 'NSString *const' to parameter of type 'enum AVMediaType' [-Wint-conversion] NSArray *devices = getDevicesWithMediaType(AVMediaTypeAudio);" +, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin && !(lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86) # Apple AVFoundation framework , withAvisynth ? withFullDeps # AviSynth script files reading , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library @@ -92,7 +93,8 @@ , withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library , withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support , withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation -, withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding +# On runtime fails with dyld[25216]: Library not loaded: libquirc.so.1.2 (Seems to not link the libary correctly) +, withQuirc ? withFullDeps && lib.versionAtLeast version "7" && !stdenv.isDarwin # QR decoding , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) , withRtmp ? withFullDeps # RTMP[E] support , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol @@ -126,8 +128,9 @@ , withXcbShape ? withFullDeps # X11 grabbing shape rendering , withXcbShm ? withFullDeps # X11 grabbing shm communication , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering -, withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC decoding -, withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC encoding +# Currently only supports gcc and msvc as compiler, the limitation for clang get removed in the next release, but that does not fix building on darwin. +, withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 && stdenv.cc.isGNU # MPEG-5 EVC decoding +, withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 && stdenv.cc.isGNU # MPEG-5 EVC encoding , withXlib ? withFullDeps # Xlib support , withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers , withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists