From 0d0c9f42aa2150773b9e1dac548da4b615fdbb66 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Jul 2025 05:38:35 +0200 Subject: [PATCH 1/2] libgpod: move to pkgs/by-name --- .../libgpod/default.nix => by-name/li/libgpod/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries/libgpod/default.nix => by-name/li/libgpod/package.nix} (100%) diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/by-name/li/libgpod/package.nix similarity index 100% rename from pkgs/development/libraries/libgpod/default.nix rename to pkgs/by-name/li/libgpod/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ada05947688f..819fa06dc2fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8619,7 +8619,7 @@ with pkgs; genPosixLockObjOnly = true; }; - libgpod = callPackage ../development/libraries/libgpod { + libgpod = callPackage ../by-name/li/libgpod/package.nix { autoreconfHook = buildPackages.autoreconfHook269; }; From 931442f9ec65b68cbebc944b9c6bde64a5bf26c0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Jul 2025 05:39:52 +0200 Subject: [PATCH 2/2] libgpod: unpin autotools --- pkgs/by-name/li/libgpod/package.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libgpod/package.nix b/pkgs/by-name/li/libgpod/package.nix index 87f00bb23df2..89cd588a4b04 100644 --- a/pkgs/by-name/li/libgpod/package.nix +++ b/pkgs/by-name/li/libgpod/package.nix @@ -4,6 +4,7 @@ fetchurl, fetchpatch, perlPackages, + gtk-doc, intltool, autoreconfHook, pkg-config, @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + gtk-doc intltool pkg-config udevCheckHook diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 819fa06dc2fd..ddef2c1e35e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8619,10 +8619,6 @@ with pkgs; genPosixLockObjOnly = true; }; - libgpod = callPackage ../by-name/li/libgpod/package.nix { - autoreconfHook = buildPackages.autoreconfHook269; - }; - libindicator-gtk2 = libindicator.override { gtkVersion = "2"; }; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5;