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

cdrtools: fix for darwin (#64460)

Browse Source
This commit is contained in:
Amar Paul 2019-07-12 11:26:08 -04:00 committed by Dmitry Kalinkin
parent f62f744ac2
commit 157d56d311
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/cdrtools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, acl, libcap }: { stdenv, fetchurl, acl, libcap, Carbon, IOKit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cdrtools-${version}"; name = "cdrtools-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
patches = [ ./fix-paths.patch ]; patches = [ ./fix-paths.patch ];
buildInputs = [ acl libcap ]; buildInputs = if stdenv.isDarwin then [ Carbon IOKit ] else [ acl libcap ];
postPatch = '' postPatch = ''
sed "/\.mk3/d" -i libschily/Targets.man sed "/\.mk3/d" -i libschily/Targets.man
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = https://sourceforge.net/projects/cdrtools/; homepage = https://sourceforge.net/projects/cdrtools/;
description = "Highly portable CD/DVD/BluRay command line recording software"; description = "Highly portable CD/DVD/BluRay command line recording software";
license = with licenses; [ gpl2 lgpl2 cddl ]; license = with licenses; [ gpl2 lgpl2 cddl ];
platforms = platforms.linux; platforms = with platforms; linux ++ darwin;
# Licensing issues: This package contains code licensed under CDDL, GPL2 # Licensing issues: This package contains code licensed under CDDL, GPL2
# and LGPL2. There is a debate regarding the legality of distributing this # and LGPL2. There is a debate regarding the legality of distributing this
# package in binary form. # package in binary form.

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

@ -17210,7 +17210,9 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon; inherit (darwin.apple_sdk.frameworks) Carbon;
}; };
cdrtools = callPackage ../applications/misc/cdrtools { }; cdrtools = callPackage ../applications/misc/cdrtools {
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
};
centerim = callPackage ../applications/networking/instant-messengers/centerim { }; centerim = callPackage ../applications/networking/instant-messengers/centerim { };