diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 6817d1a888c..bb81721feea 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: +{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }: stdenv.mkDerivation rec { name = "libcdio-2.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcddb ncurses help2man ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; # Disabled due to several spurious test failures. # doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e267a460d0d..3753bbc74eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2290,7 +2290,7 @@ with pkgs; flameGraph = flamegraph; flvtool2 = callPackage ../tools/video/flvtool2 { }; - + fmbt = callPackage ../development/tools/fmbt { python = python2; }; @@ -9555,7 +9555,10 @@ with pkgs; libcddb = callPackage ../development/libraries/libcddb { }; - libcdio = callPackage ../development/libraries/libcdio { }; + libcdio = callPackage ../development/libraries/libcdio { + inherit (darwin.apple_sdk.frameworks) Carbon IOKit; + }; + libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { }; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };