public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12120 from benley/cdparanoia-darwin

Browse Source 
cdparanoia: fix Darwin build
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-15 00:56:06 +01:00
commit a52b238bab
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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";

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

@ -11234,7 +11234,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 { };