From 528ffc4e7fc629d835f7114acc64c0c91aeadfa6 Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:40:59 +0100
Subject: [PATCH 1/2] upscayl: migrate to by-name

---
 .../upscayl/default.nix => by-name/up/upscayl/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/graphics/upscayl/default.nix => by-name/up/upscayl/package.nix} (100%)

diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/by-name/up/upscayl/package.nix
similarity index 100%
rename from pkgs/applications/graphics/upscayl/default.nix
rename to pkgs/by-name/up/upscayl/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c39a5cd60f6..69606055cc5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26489,8 +26489,6 @@ with pkgs;
 
   upower = callPackage ../os-specific/linux/upower { };
 
-  upscayl = callPackage ../applications/graphics/upscayl { };
-
   usbguard = callPackage ../os-specific/linux/usbguard { };
 
   usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { };

From 6822c26a1890c9b49bb9fb29a3eaf3e024d343a3 Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:58:06 +0100
Subject: [PATCH 2/2] upscayl: add NIXOS_OZONE_WL

---
 pkgs/by-name/up/upscayl/package.nix | 53 ++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix
index 202900983e14..414a2eb1456b 100644
--- a/pkgs/by-name/up/upscayl/package.nix
+++ b/pkgs/by-name/up/upscayl/package.nix
@@ -2,7 +2,10 @@
   appimageTools,
   fetchurl,
   lib,
-}: let
+  makeWrapper,
+}:
+
+let
   pname = "upscayl";
   version = "2.11.5";
 
@@ -15,27 +18,37 @@
     inherit pname version src;
   };
 in
-  appimageTools.wrapType2 {
-    inherit pname version src;
+appimageTools.wrapType2 {
+  inherit pname version src;
 
-    extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ];
+  nativeBuildInputs = [
+    makeWrapper
+  ];
 
-    extraInstallCommands = ''
-      mkdir -p $out/share/{applications,pixmaps}
+  extraPkgs = pkgs: [
+    pkgs.vulkan-headers
+    pkgs.vulkan-loader
+  ];
 
-      cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
-      cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png
+  extraInstallCommands = ''
+    mkdir -p $out/share/{applications,pixmaps}
 
-      substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
-    '';
+    cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+    cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png
 
-    meta = with lib; {
-      description = "Free and Open Source AI Image Upscaler";
-      homepage = "https://upscayl.github.io/";
-      maintainers = with maintainers; [icy-thought];
-      license = licenses.agpl3Plus;
-      platforms = platforms.linux;
-      mainProgram = "upscayl";
-    };
-  }
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
+
+    wrapProgram $out/bin/${pname} \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+  '';
+
+  meta = with lib; {
+    description = "Free and Open Source AI Image Upscaler";
+    homepage = "https://upscayl.github.io/";
+    maintainers = with maintainers; [ icy-thought ];
+    license = licenses.agpl3Plus;
+    platforms = platforms.linux;
+    mainProgram = "upscayl";
+  };
+}