From 6690b896157f12b4e784e5e1d325c80d77a6f0d2 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 14 Feb 2025 16:48:48 +0100
Subject: [PATCH] use gimp for wayland from an upstream PR

---
 flake.lock                                    | 29 +++++++++++++++----
 flake.nix                                     |  5 ++++
 .../configuration/graphical-fullblown.nix     |  3 +-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index e1a2e8f..2d6529c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -974,6 +974,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-gimp": {
+      "locked": {
+        "lastModified": 1735507908,
+        "narHash": "sha256-VA+khC0S0di6w5Yv1kBNRpAihnt2prT/ehQzsKMhEoA=",
+        "owner": "jtojnar",
+        "repo": "nixpkgs",
+        "rev": "771cf18187fefcfaababd35834917c621447fee8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jtojnar",
+        "ref": "gimp-meson",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-kanidm": {
       "locked": {
         "lastModified": 1729071019,
@@ -1035,11 +1051,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1733212471,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "lastModified": 1739446958,
+        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
         "type": "github"
       },
       "original": {
@@ -1296,6 +1312,7 @@
         ],
         "nixpkgs-2211": "nixpkgs-2211",
         "nixpkgs-2411": "nixpkgs-2411",
+        "nixpkgs-gimp": "nixpkgs-gimp",
         "nixpkgs-kanidm": "nixpkgs-kanidm",
         "nixpkgs-logseq": "nixpkgs-logseq",
         "nixpkgs-unstable": "nixpkgs-unstable",
@@ -1590,11 +1607,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "lastModified": 1738953846,
+        "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 1710071..a8cfb9d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,6 +111,8 @@
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nixpkgs-gimp.url = "github:jtojnar/nixpkgs/gimp-meson";
   };
 
   outputs =
@@ -336,6 +338,9 @@
                 };
 
                 inherit local-xwayland;
+
+                inherit (inputs'.nixpkgs-gimp.legacyPackages) gimp;
+
               };
 
             formatter =
diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 78d8ff3..c984c54 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -246,8 +246,9 @@ in
       # libretro.snes9x2010
       # retroarchFull
 
-      (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" {})
+      (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" { })
     ])
+    ++ (with repoFlake.packages.${pkgs.system}; [ gimp ])
     ++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
       pkgsUnstable.ledger-live-desktop