From 285ef9be090dbe5779e0439d2dfa949a5a829acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sat, 24 Mar 2018 17:58:06 +0100 Subject: [PATCH] libcdio-paranoia: fix darwin build --- .../libraries/libcdio-paranoia/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index b3aa2b1990604..48e632ba52d81 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -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"; @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a515c543a91d5..6d31e7b2fc7ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9601,7 +9601,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; };