From 7b887493518217eb6724e6e550cb56ce80b5bb57 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 19:58:41 -0700
Subject: [PATCH] bluefish: moderinize

---
 .../applications/editors/bluefish/default.nix | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix
index 8a060c9d9fe1..8d1f98d190ac 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@@ -4,7 +4,7 @@
   fetchurl,
   wrapGAppsHook3,
   pkg-config,
-  gtk,
+  gtk3,
   libxml2,
   enchant,
   gucharmap,
@@ -12,13 +12,13 @@
   adwaita-icon-theme,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bluefish";
   version = "2.2.17";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2";
-    sha256 = "sha256-Onn2Ql4Uk56hNPlsFCTjqsBb7pWQS+Q0WBiDB4p7clM=";
+    url = "mirror://sourceforge/bluefish/bluefish-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-Onn2Ql4Uk56hNPlsFCTjqsBb7pWQS+Q0WBiDB4p7clM=";
   };
 
   nativeBuildInputs = [
@@ -27,19 +27,19 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     adwaita-icon-theme
-    gtk
+    gtk3
     libxml2
     enchant
     gucharmap
     python3
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Powerful editor targeted towards programmers and webdevelopers";
     homepage = "https://bluefish.openoffice.nl/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ vbgl ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ vbgl ];
+    platforms = lib.platforms.all;
     mainProgram = "bluefish";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 548a6291147d..cbad45ddcf8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13816,9 +13816,7 @@ with pkgs;
     inherit (haskellPackages) ghcWithPackages;
   };
 
-  bluefish = callPackage ../applications/editors/bluefish {
-    gtk = gtk3;
-  };
+  bluefish = callPackage ../applications/editors/bluefish { };
 
   breezy = with python3Packages; toPythonApplication breezy;