From cea2d5618dc316f9d1fa9f0b6efcbd05c98bb103 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 5 Jan 2025 21:01:53 +0800 Subject: [PATCH 1/2] libfreefare: move to by-name --- .../li/libfreefare/package.nix} | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 9 insertions(+), 16 deletions(-) rename pkgs/{development/libraries/libfreefare/default.nix => by-name/li/libfreefare/package.nix} (67%) diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/by-name/li/libfreefare/package.nix similarity index 67% rename from pkgs/development/libraries/libfreefare/default.nix rename to pkgs/by-name/li/libfreefare/package.nix index 3bbfb5f6834f..adebc1934bb3 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/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 index e9c20f5904ff..496be821c832 100644 --- 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; From 9d7637b40f6192a13d0ab22dfe64d77547989e36 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 5 Jan 2025 21:02:42 +0800 Subject: [PATCH 2/2] libfreefare: fix build --- pkgs/by-name/li/libfreefare/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libfreefare/package.nix b/pkgs/by-name/li/libfreefare/package.nix index adebc1934bb3..8aa06f577a95 100644 --- a/pkgs/by-name/li/libfreefare/package.nix +++ b/pkgs/by-name/li/libfreefare/package.nix @@ -29,10 +29,15 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk ]; + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + ]; + }; + meta = { description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations"; license = lib.licenses.lgpl3;