Skip to content

Commit

Permalink
libcdio-paranoia: fix darwin build
Browse files Browse the repository at this point in the history
(cherry picked from commit 285ef9b)
  • Loading branch information
knedlsepp authored and Mic92 committed Mar 24, 2018
1 parent e32dee8 commit a978eee
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
12 changes: 10 additions & 2 deletions pkgs/development/libraries/libcdio-paranoia/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig }:
{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig,
libiconv, IOKit, DiskArbitration}:

stdenv.mkDerivation {
name = "libcdio-paranoia-0.94+2";
Expand All @@ -11,7 +12,14 @@ stdenv.mkDerivation {
};

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; {
description = "CD paranoia on top of libcdio";
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9563,7 +9563,9 @@ with pkgs;
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; };

Expand Down

0 comments on commit a978eee

Please sign in to comment.