diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 654741283f95..a7d081c565dd 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -138,6 +138,10 @@ , optimizationsDeveloper ? true , extraWarningsDeveloper ? false , strippingDeveloper ? false +/* + * Darwin frameworks + */ +, Cocoa, CoreServices }: /* Maintainer notes: @@ -405,7 +409,8 @@ stdenv.mkDerivation rec { ++ optionals x11grabExtlib [ libXext libXfixes ] ++ optionals nonfreeLicensing [ faac fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva - ++ optionals isLinux [ alsaLib libraw1394 libv4l ]; + ++ optionals isLinux [ alsaLib libraw1394 libv4l ] + ++ optionals stdenv.isDarwin [ Cocoa CoreServices ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 1d6b00abe539..c96a2b7f051a 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libraw1394, libusb1 }: +{ stdenv, fetchurl, libraw1394, libusb1 +, CoreServices +}: stdenv.mkDerivation rec { name = "libdc1394-2.2.3"; @@ -9,7 +11,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb1 ] - ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ]; + ++ stdenv.lib.optional stdenv.isLinux libraw1394 + ++ stdenv.lib.optional stdenv.isDarwin CoreServices; meta = { homepage = http://sourceforge.net/projects/libdc1394/; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 1fac43fa2a97..48a2999e7af9 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: +{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig +, Carbon +}: stdenv.mkDerivation rec { name = "libsndfile-1.0.25"; @@ -8,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar"; }; - buildInputs = [ pkgconfig flac libogg libvorbis ]; + buildInputs = [ pkgconfig flac libogg libvorbis ] + ++ stdenv.lib.optional stdenv.isDarwin Carbon; # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 074b26e3f3a5..3bdb1392bd97 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "wavpack-${version}"; @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + patches = [ # backported from # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ddebde3a205..213d0f8338cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6260,18 +6260,16 @@ let # The following need to be fixed on Darwin frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; - gsm = if stdenv.isDarwin then null else gsm; libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; - libssh = if stdenv.isDarwin then null else libssh; libvpx = if stdenv.isDarwin then null else libvpx; openal = if stdenv.isDarwin then null else openal; - openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices; }; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; @@ -6965,7 +6963,9 @@ let libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt-5.4.nix { }; - libdc1394 = callPackage ../development/libraries/libdc1394 { }; + libdc1394 = callPackage ../development/libraries/libdc1394 { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; libdc1394avt = callPackage ../development/libraries/libdc1394avt { }; @@ -7437,7 +7437,9 @@ let # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; - libsndfile = callPackage ../development/libraries/libsndfile { }; + libsndfile = callPackage ../development/libraries/libsndfile { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; libsodium = callPackage ../development/libraries/libsodium { }; @@ -8529,7 +8531,9 @@ let libpng = libpng12; }; - wavpack = callPackage ../development/libraries/wavpack { }; + wavpack = callPackage ../development/libraries/wavpack { + inherit (darwin) libiconv; + }; wayland = callPackage ../development/libraries/wayland { graphviz = graphviz-nox;