From 8df017265efe4ca8f51fc3765a23324510d16ab3 Mon Sep 17 00:00:00 2001 From: Mathieu Rene Date: Sun, 12 Mar 2023 16:12:45 -0400 Subject: [PATCH 1/3] qt5.qtwebengine: fix Qt version number in cmake Previously fixed in 97904f8424ccbba6de4ae63e7e97c2c4edf65567 and #118084, but the fix was only applied to linux platforms. This fixes libraries that depend on qtwebengine under darwin platforms. --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index bebfe37f686e..60899e50535f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -221,6 +221,7 @@ qtModule { Prefix = .. EOF + '' + '' # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3) sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake ''; From e4c31c2dfc82bc6d87c0537715afd63ddff0c4f1 Mon Sep 17 00:00:00 2001 From: Mathieu Rene Date: Sun, 12 Mar 2023 16:15:14 -0400 Subject: [PATCH 2/3] opencv3: Build with video input under darwin platforms Adds the right dependencies for encoding video, and removes the cmake flag preventing the feature to be compiled in. --- pkgs/development/libraries/opencv/3.x.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 75d8c712df1f..45d55542c82a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -32,7 +32,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 +, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2, CoreMedia, MediaToolbox }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; @@ -211,7 +211,7 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] + ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy @@ -250,7 +250,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" - "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ] ++ lib.optionals enableEigen [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9103cf91a26..ff8ced9c8852 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22743,7 +22743,7 @@ with pkgs; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; ffmpeg = ffmpeg_4; }; From ab570e4a4262468034928efec5c8bd340d81191a Mon Sep 17 00:00:00 2001 From: Mathieu Rene Date: Sun, 12 Mar 2023 16:21:49 -0400 Subject: [PATCH 3/3] sdrangel: fix darwin build Tested and changed the platform metadata for the dependent libs. --- pkgs/applications/radio/sdrangel/default.nix | 9 +++++---- pkgs/development/libraries/aptdec/default.nix | 2 +- pkgs/development/libraries/cm256cc/default.nix | 2 +- pkgs/development/libraries/dab_lib/default.nix | 2 +- pkgs/development/libraries/dsdcc/default.nix | 2 +- pkgs/development/libraries/qt-5/modules/qtspeech.nix | 4 ++-- pkgs/development/libraries/serialdv/default.nix | 2 +- pkgs/development/libraries/sgp4/default.nix | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 392088eca95f..0bda52d425e4 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -1,4 +1,6 @@ -{ airspy +{ lib +, stdenv +, airspy , airspyhf , aptdec , boost @@ -13,7 +15,6 @@ , glew , hackrf , hidapi -, lib , ffmpeg , libiio , libopus @@ -95,7 +96,7 @@ mkDerivation rec { "-DDAB_LIB=${dab_lib}" "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include" - "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so" + "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite${stdenv.hostPlatform.extensions.sharedLibrary}" "-DSGP4_DIR=${sgp4}" "-DSOAPYSDR_DIR=${soapysdr-with-plugins}" ]; @@ -110,6 +111,6 @@ mkDerivation rec { homepage = "https://github.com/f4exb/sdrangel"; license = licenses.gpl3Plus; maintainers = with maintainers; [ alkeryn ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aptdec/default.nix b/pkgs/development/libraries/aptdec/default.nix index 5f1db6d35593..dce52f7e668c 100644 --- a/pkgs/development/libraries/aptdec/default.nix +++ b/pkgs/development/libraries/aptdec/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = "https://github.com/Xerbo/aptdec"; license = licenses.gpl2; maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index 3a2538898cce..4b49bcbbcc99 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++"; homepage = "https://github.com/f4exb/cm256cc"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ alkeryn ]; license = licenses.gpl3; }; diff --git a/pkgs/development/libraries/dab_lib/default.nix b/pkgs/development/libraries/dab_lib/default.nix index 7570d8aaca72..019456b3c5d7 100644 --- a/pkgs/development/libraries/dab_lib/default.nix +++ b/pkgs/development/libraries/dab_lib/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = "https://github.com/JvanKatwijk/dab-cmdline"; license = licenses.gpl2; maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/development/libraries/dsdcc/default.nix index a992eac27cb0..3bc8d6c49a8e 100644 --- a/pkgs/development/libraries/dsdcc/default.nix +++ b/pkgs/development/libraries/dsdcc/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/f4exb/dsdcc"; license = licenses.gpl3; maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix index a1ecb48f0d9d..371162324c0b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -1,9 +1,9 @@ -{ qtModule, speechd, pkg-config }: +{ lib, qtModule, stdenv, speechd, pkg-config }: qtModule { pname = "qtspeech"; qtInputs = [ ]; - buildInputs = [ speechd ]; + buildInputs = lib.optionals stdenv.isLinux [ speechd ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix index d1d9c6299b35..bff7a107eebe 100644 --- a/pkgs/development/libraries/serialdv/default.nix +++ b/pkgs/development/libraries/serialdv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link"; homepage = "https://github.com/f4exb/serialdv"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ alkeryn ]; license = licenses.gpl3; }; diff --git a/pkgs/development/libraries/sgp4/default.nix b/pkgs/development/libraries/sgp4/default.nix index 98c62f9cd345..166e3c08fd30 100644 --- a/pkgs/development/libraries/sgp4/default.nix +++ b/pkgs/development/libraries/sgp4/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://github.com/dnwrnr/sgp4"; license = licenses.asl20; maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }