Merge pull request #12120 from benley/cdparanoia-darwin

cdparanoia: fix Darwin build

+11 -3
+7 -2
pkgs/applications/audio/cdparanoia/default.nix
··· 1 - { stdenv, fetchurl }: 1 + { stdenv, fetchurl, IOKit, Carbon }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "cdparanoia-III-10.2"; ··· 10 10 11 11 preConfigure = "unset CC"; 12 12 13 - patches = stdenv.lib.optionals stdenv.isDarwin [ 13 + patches = stdenv.lib.optionals stdenv.isDarwin [ 14 14 (fetchurl { 15 15 url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; 16 16 sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd"; ··· 19 19 url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; 20 20 sha1 = "d7dc121374df3b82e82adf544df7bf1eec377bdb"; 21 21 }) 22 + ]; 23 + 24 + buildInputs = stdenv.lib.optional stdenv.isDarwin [ 25 + Carbon 26 + IOKit 22 27 ]; 23 28 24 29 meta = {
+4 -1
pkgs/top-level/all-packages.nix
··· 11234 11234 11235 11235 cdparanoia = cdparanoiaIII; 11236 11236 11237 - cdparanoiaIII = callPackage ../applications/audio/cdparanoia { }; 11237 + cdparanoiaIII = callPackage ../applications/audio/cdparanoia { 11238 + inherit (darwin) IOKit; 11239 + inherit (darwin.apple_sdk.frameworks) Carbon; 11240 + }; 11238 11241 11239 11242 cdrtools = callPackage ../applications/misc/cdrtools { }; 11240 11243