alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cdparanoia: fix Darwin build

Browse source 
Fixes
This commit is contained in:
Benjamin Staffin 2016-01-03 15:49:09 -08:00
parent 52f2d9ffc8
commit 9f3889a9a5
2 changed files with 11 additions and 3 deletions
pkgs
applications/audio/cdparanoia
default.nix
top-level
all-packages.nix

9
pkgs/applications/audio/cdparanoia/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, IOKit, Carbon }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cdparanoia-III-10.2"; name = "cdparanoia-III-10.2";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
preConfigure = "unset CC"; preConfigure = "unset CC";
patches = stdenv.lib.optionals stdenv.isDarwin [ patches = stdenv.lib.optionals stdenv.isDarwin [
(fetchurl { (fetchurl {
url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch";
sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd"; sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd";
@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
}) })
]; ];
buildInputs = stdenv.lib.optional stdenv.isDarwin [
Carbon
IOKit
];
meta = { meta = {
homepage = http://xiph.org/paranoia; homepage = http://xiph.org/paranoia;
description = "A tool and library for reading digital audio from CDs"; description = "A tool and library for reading digital audio from CDs";

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

@ -11222,7 +11222,10 @@ let
cdparanoia = cdparanoiaIII; 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 { }; cdrtools = callPackage ../applications/misc/cdrtools { };