From 36967779e93f9c657dc288aabedf7f78f2764c68 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:38:09 -0700
Subject: [PATCH] petrifoo: modernize, move to by-name/

---
 .../pe/petrifoo/package.nix}                     | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  4 ----
 2 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/petrifoo/default.nix => by-name/pe/petrifoo/package.nix} (84%)

diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/by-name/pe/petrifoo/package.nix
similarity index 84%
rename from pkgs/applications/audio/petrifoo/default.nix
rename to pkgs/by-name/pe/petrifoo/package.nix
index 71eb8a766482..864c1668c47a 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/by-name/pe/petrifoo/package.nix
@@ -7,7 +7,7 @@
   cmake,
   gtk2,
   libjack2,
-  libgnomecanvas,
+  gnome2,
   libpthreadstubs,
   libsamplerate,
   libsndfile,
@@ -17,12 +17,12 @@
   openssl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "petri-foo";
   version = "0.1.87";
 
   src = fetchurl {
-    url = "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/petri-foo/petri-foo-${finalAttrs.version}.tar.bz2";
     sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     gtk2
     libjack2
-    libgnomecanvas
+    gnome2.libgnomecanvas
     libpthreadstubs
     libsamplerate
     libsndfile
@@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "MIDI controllable audio sampler";
     longDescription = "a fork of Specimen";
     homepage = "https://petri-foo.sourceforge.net";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
     mainProgram = "petri-foo";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68af85ebbdb7..f219668bf496 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12084,10 +12084,6 @@ with pkgs;
     sed = gnused;
   };
 
-  petrifoo = callPackage ../applications/audio/petrifoo {
-    inherit (gnome2) libgnomecanvas;
-  };
-
   pdfpc = callPackage ../applications/misc/pdfpc {
     inherit (gst_all_1)
       gstreamer