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

libcdio: fix darwin build

Browse Source
This commit is contained in:
Daiderd Jordan 2017-01-24 22:45:08 +01:00
parent 02cc679734
commit e20fc5059d
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libcdio/0.82.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: { stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcdio-0.82"; name = "libcdio-0.82";
@ -8,12 +8,13 @@ stdenv.mkDerivation rec {
sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs";
}; };
buildInputs = [ libcddb pkgconfig ncurses help2man ]; buildInputs = [ libcddb pkgconfig ncurses help2man ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
# Disabled because one test (check_paranoia.sh) fails. # Disabled because one test (check_paranoia.sh) fails.
#doCheck = true; #doCheck = true;
meta = { meta = with stdenv.lib; {
description = "A library for OS-independent CD-ROM and CD image access"; description = "A library for OS-independent CD-ROM and CD image access";
longDescription = '' longDescription = ''
GNU libcdio is a library for OS-independent CD-ROM and GNU libcdio is a library for OS-independent CD-ROM and
@ -21,8 +22,8 @@ stdenv.mkDerivation rec {
ISO-9660 filesystems (libiso9660), as well as utility ISO-9660 filesystems (libiso9660), as well as utility
programs such as an audio CD player and an extractor. programs such as an audio CD player and an extractor.
''; '';
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
homepage = http://www.gnu.org/software/libcdio/; homepage = http://www.gnu.org/software/libcdio/;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

11
pkgs/development/libraries/libcdio/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: { stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcdio-0.93"; name = "libcdio-0.93";
@ -8,12 +8,13 @@ stdenv.mkDerivation rec {
sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq";
}; };
buildInputs = [ libcddb pkgconfig ncurses help2man ]; buildInputs = [ libcddb pkgconfig ncurses help2man ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
# Disabled because one test (check_paranoia.sh) fails. # Disabled because one test (check_paranoia.sh) fails.
#doCheck = true; #doCheck = true;
meta = { meta = with stdenv.lib; {
description = "A library for OS-independent CD-ROM and CD image access"; description = "A library for OS-independent CD-ROM and CD image access";
longDescription = '' longDescription = ''
GNU libcdio is a library for OS-independent CD-ROM and GNU libcdio is a library for OS-independent CD-ROM and
@ -21,8 +22,8 @@ stdenv.mkDerivation rec {
ISO-9660 filesystems (libiso9660), as well as utility ISO-9660 filesystems (libiso9660), as well as utility
programs such as an audio CD player and an extractor. programs such as an audio CD player and an extractor.
''; '';
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.gnu.org/software/libcdio/; homepage = http://www.gnu.org/software/libcdio/;
platforms = stdenv.lib.platforms.linux; license = licenses.gpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
}; };
} }