BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #37735 from knedlsepp/fix-libcdio-paranoia-on-darwin

Browse source 
libcdio-paranoia: fix darwin build
This commit is contained in:
Jörg Thalheim 2018-03-24 19:20:41 +00:00 committed by GitHub
commit 394a7099e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/libcdio-paranoia/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig }: { stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig,
libiconv, IOKit, DiskArbitration}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libcdio-paranoia-0.94+2"; name = "libcdio-paranoia-0.94+2";
@ -11,7 +12,14 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libcdio ]; buildInputs = [ libcdio ] ++
stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration;
configureFlags = stdenv.lib.optionals stdenv.isDarwin [
"--disable-ld-version-script"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "CD paranoia on top of libcdio"; description = "CD paranoia on top of libcdio";

4
pkgs/top-level/all-packages.nix
View file

@ -9601,7 +9601,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon IOKit; inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
}; };
libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { }; libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia {
inherit (darwin.apple_sdk.frameworks) DiskArbitration IOKit;
};
libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };