From acd9639d88942b0d4b94d73135d5cd2f6ddb6666 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:15:38 +0100
Subject: [PATCH 1/3] ldid: move to pkgs/by-name

---
 .../tools/ldid/default.nix => by-name/ld/ldid/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{development/tools/ldid/default.nix => by-name/ld/ldid/package.nix} (100%)

diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/by-name/ld/ldid/package.nix
similarity index 100%
rename from pkgs/development/tools/ldid/default.nix
rename to pkgs/by-name/ld/ldid/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cdb7c778357..1afbcacb55f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18290,7 +18290,7 @@ with pkgs;
     wlroots = wlroots_0_17;
   };
 
-  ldid = callPackage ../development/tools/ldid {
+  ldid = callPackage ../by-name/ld/ldid/package.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 

From 75c99c03db5f15676068bf60e7e62835b95b48d7 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:19:51 +0100
Subject: [PATCH 2/3] ldid: use new apple sdk pattern

---
 pkgs/by-name/ld/ldid/package.nix | 33 ++++++++++----------------------
 pkgs/top-level/all-packages.nix  |  4 ----
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/ld/ldid/package.nix b/pkgs/by-name/ld/ldid/package.nix
index c0c2645ab094..43b34a567543 100644
--- a/pkgs/by-name/ld/ldid/package.nix
+++ b/pkgs/by-name/ld/ldid/package.nix
@@ -5,8 +5,6 @@
   libplist,
   libxml2,
   openssl,
-  CoreFoundation,
-  Security,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,33 +19,22 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  buildInputs =
-    [
-      libplist
-      libxml2
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      CoreFoundation
-      Security
-    ];
+  buildInputs = [
+    libplist
+    libxml2
+    openssl
+  ];
 
-  NIX_LDFLAGS =
-    [
-      "-lcrypto"
-      "-lplist-2.0"
-      "-lxml2"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-framework CoreFoundation"
-      "-framework Security"
-    ];
+  env.NIX_LDFLAGS = toString ([
+    "-lcrypto"
+    "-lplist-2.0"
+  ]);
 
   buildPhase = ''
     runHook preBuild
 
     cc -c -o lookup2.o lookup2.c -I.
-    c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I. ${toString NIX_LDFLAGS}
+    c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I.
 
     runHook postBuild
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1afbcacb55f0..925c68f77eff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18290,10 +18290,6 @@ with pkgs;
     wlroots = wlroots_0_17;
   };
 
-  ldid = callPackage ../by-name/ld/ldid/package.nix {
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-  };
-
   zrythm = callPackage ../applications/audio/zrythm {
     inherit (plasma5Packages) breeze-icons;
   };

From 5f99f2bdbbf78f8009eed64e551bc9f92a89e32b Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:22:39 +0100
Subject: [PATCH 3/3] ldid: refactor

---
 pkgs/by-name/ld/ldid/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ld/ldid/package.nix b/pkgs/by-name/ld/ldid/package.nix
index 43b34a567543..5dcd0622db0b 100644
--- a/pkgs/by-name/ld/ldid/package.nix
+++ b/pkgs/by-name/ld/ldid/package.nix
@@ -7,13 +7,13 @@
   openssl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ldid";
   version = "2.1.5";
 
   src = fetchgit {
     url = "git://git.saurik.com/ldid.git";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM=";
   };
 
@@ -48,11 +48,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Link Identity Editor";
     homepage = "https://cydia.saurik.com/info/ldid/";
-    maintainers = with maintainers; [ wegank ];
-    platforms = platforms.unix;
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
+    mainProgram = "ldid";
+    maintainers = with lib.maintainers; [ wegank ];
+    platforms = lib.platforms.unix;
   };
-}
+})