diff options
author | Benjamin Staffin <bstaffin@fitbit.com> | 2016-01-03 15:49:09 -0800 |
---|---|---|
committer | Benjamin Staffin <bstaffin@fitbit.com> | 2016-01-03 15:49:09 -0800 |
commit | 9f3889a9a5a78bf373a09c8444ecc408745a71ea (patch) | |
tree | 4ef067f8c969340da6d24afaa71e0b716ae53001 | |
parent | 52f2d9ffc8398963ca1cd7eb6c04e961defb2672 (diff) | |
download | nixpkgs-9f3889a9a5a78bf373a09c8444ecc408745a71ea.tar nixpkgs-9f3889a9a5a78bf373a09c8444ecc408745a71ea.tar.gz nixpkgs-9f3889a9a5a78bf373a09c8444ecc408745a71ea.tar.bz2 nixpkgs-9f3889a9a5a78bf373a09c8444ecc408745a71ea.tar.lz nixpkgs-9f3889a9a5a78bf373a09c8444ecc408745a71ea.tar.xz nixpkgs-9f3889a9a5a78bf373a09c8444ecc408745a71ea.tar.zst nixpkgs-9f3889a9a5a78bf373a09c8444ecc408745a71ea.zip |
cdparanoia: fix Darwin build
Fixes #12116
-rw-r--r-- | pkgs/applications/audio/cdparanoia/default.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 25cc33d6cb8..1658d9c7449 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, IOKit, Carbon }: stdenv.mkDerivation rec { name = "cdparanoia-III-10.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "unset CC"; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = stdenv.lib.optionals stdenv.isDarwin [ (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd"; @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { }) ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin [ + Carbon + IOKit + ]; + meta = { homepage = http://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25e65c43119..abd23842879 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11222,7 +11222,10 @@ let cdparanoia = cdparanoiaIII; - cdparanoiaIII = callPackage ../applications/audio/cdparanoia { }; + cdparanoiaIII = callPackage ../applications/audio/cdparanoia { + inherit (darwin) IOKit; + inherit (darwin.apple_sdk.frameworks) Carbon; + }; cdrtools = callPackage ../applications/misc/cdrtools { }; |