From 58651820bf8d249319949b3bf282baac55eb5127 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 10 Dec 2023 14:42:19 +0100
Subject: [PATCH] idsk: refactor

---
 pkgs/by-name/id/idsk/package.nix        | 46 +++++++++++++++++++++++++
 pkgs/tools/filesystems/idsk/default.nix | 35 -------------------
 pkgs/top-level/all-packages.nix         |  2 --
 3 files changed, 46 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/by-name/id/idsk/package.nix
 delete mode 100644 pkgs/tools/filesystems/idsk/default.nix

diff --git a/pkgs/by-name/id/idsk/package.nix b/pkgs/by-name/id/idsk/package.nix
new file mode 100644
index 000000000000..58774d62c31a
--- /dev/null
+++ b/pkgs/by-name/id/idsk/package.nix
@@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "idsk";
+  version = "0.20";
+
+  src = fetchFromGitHub {
+    owner = "cpcsdk";
+    repo = "idsk";
+    rev = "v${version}";
+    hash = "sha256-rYClWq1Nl3COoG+eOJyFDTvBSzpHpGminU4bndZs6xc=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/cpcsdk/idsk/commit/52fa3cdcc10d4ba6c75cab10ca7067b129198d92.patch";
+      hash = "sha256-Ll0apllNj+fP7kZ1n+bBowrlskLK1bIashxxgPVVxmg=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 iDSK $out/bin/iDSK
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Manipulating CPC dsk images and files";
+    homepage = "https://github.com/cpcsdk/idsk";
+    license = licenses.mit;
+    mainProgram = "iDSK";
+    maintainers = with maintainers; [ wegank ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
deleted file mode 100644
index 5e78a1266873..000000000000
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-
-  pname = "idsk";
-  version = "0.20";
-
-  src = fetchFromGitHub {
-    repo = "idsk";
-    owner = "cpcsdk";
-    rev = "v${version}";
-    sha256 = "05zbdkb9s6sfkni6k927795w2fqdhnf3i7kgl27715sdmmdab05d";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
-    # Needed with GCC 12 but breaks on darwin (with clang)
-    "-std=c++14"
-  ]);
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp iDSK $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Manipulating CPC dsk images and files";
-    homepage = "https://github.com/cpcsdk/idsk" ;
-    license = licenses.mit;
-    maintainers = [ ];
-    mainProgram = "iDSK";
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e59de08224d3..82b4227481fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -40467,8 +40467,6 @@ with pkgs;
 
   utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
 
-  idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; };
-
   colima = callPackage ../applications/virtualization/colima { };
 
   lima = callPackage ../applications/virtualization/lima {