From afb50202a370e0356ce86801d8ef69eec30cbac6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 17:42:09 +0000 Subject: [PATCH 1/3] libcdio: broaden platforms From the homepage: > The cdparanoia library and cdparanoia command are included making > this the only single-source cdparanoia that works on FreeBSD, > NetBSD, OSX, cygwin, Solaris, BSDI as well as GNU/Linux. Builds fine for FreeBSD and NetBSD. --- pkgs/development/libraries/libcdio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 324f0669af31..e884cb3c3925 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/libcdio/"; license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } From ebddf0144f7928b082b36f3940399e277ffcc278 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 17:46:53 +0000 Subject: [PATCH 2/3] libcdio: depend on libiconv unconditionally libiconv is already defined per-platform. The actual libiconv library won't be built on platforms like Linux where it doesn't need to be, so there's no need to maintain a separate platform list here. Required to build for FreeBSD. --- pkgs/development/libraries/libcdio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index e884cb3c3925..9394f26a9ec5 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config help2man ]; - buildInputs = [ libcddb ncurses ] - ++ lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; + buildInputs = [ libcddb libiconv ncurses ] + ++ lib.optionals stdenv.isDarwin [ Carbon IOKit ]; doCheck = !stdenv.isDarwin; From 336b58d845ebd3f18ece42f537bf0ca1f885b413 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 18:01:15 +0000 Subject: [PATCH 3/3] libcdio: enable parallel building Tested at -j4. --- pkgs/development/libraries/libcdio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 9394f26a9ec5..aacb7555a4b6 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { buildInputs = [ libcddb libiconv ncurses ] ++ lib.optionals stdenv.isDarwin [ Carbon IOKit ]; + enableParallelBuilding = true; + doCheck = !stdenv.isDarwin; meta = with lib; {