From 8e2856faf24f06673d18936cf8ceb2bb45371e45 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 25 Mar 2025 17:43:03 +0100 Subject: [PATCH 1/7] libcdio: remove darwin frameworks --- pkgs/development/libraries/libcdio/default.nix | 18 ++++++------------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 85a3fbbcd33a..dc8011e252f3 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -7,8 +7,6 @@ ncurses, help2man, libiconv, - Carbon, - IOKit, }: stdenv.mkDerivation rec { @@ -32,16 +30,12 @@ stdenv.mkDerivation rec { pkg-config help2man ]; - buildInputs = - [ - libcddb - libiconv - ncurses - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - IOKit - ]; + + buildInputs = [ + libcddb + libiconv + ncurses + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1319f5d2667..f4b533419194 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9311,9 +9311,7 @@ with pkgs; libcef = callPackage ../development/libraries/libcef { }; - libcdio = callPackage ../development/libraries/libcdio { - inherit (darwin.apple_sdk.frameworks) Carbon IOKit; - }; + libcdio = callPackage ../development/libraries/libcdio { }; libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { inherit (darwin.apple_sdk.frameworks) DiskArbitration IOKit; From 0fb6da6ff12b6007c9d8727d4ef05e7870f8734c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 25 Mar 2025 17:44:35 +0100 Subject: [PATCH 2/7] libcdio: move to by-name --- .../libcdio/default.nix => by-name/li/libcdio/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libcdio/default.nix => by-name/li/libcdio/package.nix} (100%) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/by-name/li/libcdio/package.nix similarity index 100% rename from pkgs/development/libraries/libcdio/default.nix rename to pkgs/by-name/li/libcdio/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4b533419194..26f5ce1d9c42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9311,8 +9311,6 @@ with pkgs; libcef = callPackage ../development/libraries/libcef { }; - libcdio = callPackage ../development/libraries/libcdio { }; - libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { inherit (darwin.apple_sdk.frameworks) DiskArbitration IOKit; }; From 937c706c27a925ca60c93896f36a10b488b84dcd Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 25 Mar 2025 17:52:08 +0100 Subject: [PATCH 3/7] libcdio: use fetchFromGitHub --- pkgs/by-name/li/libcdio/package.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix index dc8011e252f3..38953aa4221c 100644 --- a/pkgs/by-name/li/libcdio/package.nix +++ b/pkgs/by-name/li/libcdio/package.nix @@ -1,7 +1,9 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, + texinfo, libcddb, pkg-config, ncurses, @@ -13,9 +15,11 @@ stdenv.mkDerivation rec { pname = "libcdio"; version = "2.2.0"; - src = fetchurl { - url = "https://github.com/libcdio/libcdio/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-b4+99NGJz2Pyp6FUnFFs1yDHsiLHqq28kkom50WkhTk="; + src = fetchFromGitHub { + owner = "libcdio"; + repo = "libcdio"; + tag = version; + hash = "sha256-izjZk2kz9PkLm9+INUdl1e7jMz3nUsQKdplKI9Io+CM="; }; env = lib.optionalAttrs stdenv.is32bit { @@ -24,11 +28,23 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + echo " + @set UPDATED 1 January 1970 + @set UPDATED-MONTH January 1970 + @set EDITION ${version} + @set VERSION ${version} + " > doc/version.texi ''; + configureFlags = [ + (lib.enableFeature true "maintainer-mode") + ]; + nativeBuildInputs = [ pkg-config help2man + autoreconfHook + texinfo ]; buildInputs = [ From 7c08955d3462a4ac3b7f2755746ea01508d18bb2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 25 Mar 2025 17:52:49 +0100 Subject: [PATCH 4/7] libcdio: split output --- pkgs/by-name/li/libcdio/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix index 38953aa4221c..4524640721c3 100644 --- a/pkgs/by-name/li/libcdio/package.nix +++ b/pkgs/by-name/li/libcdio/package.nix @@ -57,6 +57,14 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isDarwin; + outputs = [ + "out" + "lib" + "dev" + "info" + "man" + ]; + meta = with lib; { description = "Library for OS-independent CD-ROM and CD image access"; longDescription = '' From 79c1f678fd21e7804215559f1b0f13f3abd5e4b2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 25 Mar 2025 17:55:47 +0100 Subject: [PATCH 5/7] libcdio: add pkgConfigModules --- pkgs/by-name/li/libcdio/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix index 4524640721c3..4c89d3bc40c0 100644 --- a/pkgs/by-name/li/libcdio/package.nix +++ b/pkgs/by-name/li/libcdio/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, + testers, texinfo, libcddb, pkg-config, @@ -11,14 +12,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcdio"; version = "2.2.0"; src = fetchFromGitHub { owner = "libcdio"; repo = "libcdio"; - tag = version; + tag = finalAttrs.version; hash = "sha256-izjZk2kz9PkLm9+INUdl1e7jMz3nUsQKdplKI9Io+CM="; }; @@ -31,8 +32,8 @@ stdenv.mkDerivation rec { echo " @set UPDATED 1 January 1970 @set UPDATED-MONTH January 1970 - @set EDITION ${version} - @set VERSION ${version} + @set EDITION ${finalAttrs.version} + @set VERSION ${finalAttrs.version} " > doc/version.texi ''; @@ -65,6 +66,10 @@ stdenv.mkDerivation rec { "man" ]; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = with lib; { description = "Library for OS-independent CD-ROM and CD image access"; longDescription = '' @@ -75,6 +80,13 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/libcdio/"; license = licenses.gpl2Plus; + pkgConfigModules = [ + "libcdio" + "libcdio++" + "libiso9660" + "libiso9660++" + "libudf" + ]; platforms = platforms.unix; }; -} +}) From ced9e64fafc81118179832f18e5c2f9088aff281 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 25 Mar 2025 17:58:25 +0100 Subject: [PATCH 6/7] libcdio: add update script --- pkgs/by-name/li/libcdio/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix index 4c89d3bc40c0..800157109f04 100644 --- a/pkgs/by-name/li/libcdio/package.nix +++ b/pkgs/by-name/li/libcdio/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, autoreconfHook, testers, texinfo, @@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = nix-update-script { }; }; meta = with lib; { From afd32df18c0254b63177bcfa15c9b617a12c72df Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 3 Apr 2025 19:58:02 +0200 Subject: [PATCH 7/7] libcdio: remove with lib; --- pkgs/by-name/li/libcdio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix index 800157109f04..73f1f6de7667 100644 --- a/pkgs/by-name/li/libcdio/package.nix +++ b/pkgs/by-name/li/libcdio/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Library for OS-independent CD-ROM and CD image access"; longDescription = '' GNU libcdio is a library for OS-independent CD-ROM and @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { programs such as an audio CD player and an extractor. ''; homepage = "https://www.gnu.org/software/libcdio/"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; pkgConfigModules = [ "libcdio" "libcdio++" @@ -89,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: { "libiso9660++" "libudf" ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; })