libfreefare: move to by-name

NixOS · Jan 5, 2025 · cea2d56 · cea2d56
1 parent 6f4b580
commit cea2d56
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/...lopment/libraries/libfreefare/default.nix → pkgs/by-name/li/libfreefare/package.nix b/...lopment/libraries/libfreefare/default.nix → pkgs/by-name/li/libfreefare/package.nix
@@ -6,9 +6,7 @@
   pkg-config,
   libnfc,
   openssl,
-  libobjc ? null,
-  IOKit,
-  Security,
+  darwin,
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libfreefare/libfreefare-0.4.0.tar.bz2";
-    sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
+    hash = "sha256-v6MdFKmaEkf17UkZXWNz3lEuPrdb8WJ2WLQM9/h2vGQ=";
   };
 
   nativeBuildInputs = [
@@ -30,16 +28,16 @@ stdenv.mkDerivation {
       openssl
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libobjc
-      IOKit
-      Security
+      darwin.libobjc
+      darwin.apple_sdk.frameworks.IOKit
+      darwin.apple_sdk.frameworks.Security
     ];
 
-  meta = with lib; {
+  meta = {
     description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations";
-    license = licenses.lgpl3;
+    license = lib.licenses.lgpl3;
     homepage = "https://github.com/nfc-tools/libfreefare";
-    maintainers = with maintainers; [ bobvanderlinden ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ bobvanderlinden ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -9657,11 +9657,6 @@ with pkgs;
     doCheck = false;
   };
 
-  libfreefare = callPackage ../development/libraries/libfreefare {
-    inherit (darwin.apple_sdk.frameworks) IOKit Security;
-    inherit (darwin) libobjc;
-  };
-
   libftdi = callPackage ../development/libraries/libftdi {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) IOKit Security;