public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcdio: fix darwin build

Browse Source 
/cc ZHF #36454
This commit is contained in:
Daiderd Jordan 2018-03-12 21:32:38 +01:00
parent 4ba61cd136
commit af041b34a2
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libcdio/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: { stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcdio-2.0.0"; name = "libcdio-2.0.0";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libcddb ncurses help2man ] 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. # Disabled due to several spurious test failures.
# doCheck = true; # doCheck = true;

7
pkgs/top-level/all-packages.nix
View File

@ -2290,7 +2290,7 @@ with pkgs;
flameGraph = flamegraph; flameGraph = flamegraph;
flvtool2 = callPackage ../tools/video/flvtool2 { }; flvtool2 = callPackage ../tools/video/flvtool2 { };
fmbt = callPackage ../development/tools/fmbt { fmbt = callPackage ../development/tools/fmbt {
python = python2; python = python2;
}; };
@ -9555,7 +9555,10 @@ with pkgs;
libcddb = callPackage ../development/libraries/libcddb { }; 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 { }; libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { };
libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };