diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index cc953ba23ec83..84c2f283d0358 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -10,7 +10,6 @@ lua5_2, curl, readline, - PCSC, }: let version = "0.8.4"; @@ -29,33 +28,30 @@ stdenv.mkDerivation { postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # replace xcode check and hard-coded PCSC framework path substituteInPlace configure.ac \ - --replace 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ - --replace 'PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`' 'PCSC_HEADERS=${PCSC}/Library/Frameworks/PCSC.framework/Headers' + --replace-fail 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ + --replace-fail 'PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`' 'PCSC_HEADERS=$SDKROOT/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers' ''; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = - [ - glib - gtk3 - lua5_2 - curl - readline - ] - ++ lib.optional stdenv.hostPlatform.isDarwin PCSC - ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; + buildInputs = [ + glib + gtk3 + lua5_2 + curl + readline + ] ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/L1L1/cardpeek"; description = "Tool to read the contents of ISO7816 smart cards"; - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ embr ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ embr ]; mainProgram = "cardpeek"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff9041c61f989..c4faa8dc030fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2202,9 +2202,7 @@ with pkgs; catch2_3 = callPackage ../development/libraries/catch2/3.nix { }; - cardpeek = callPackage ../applications/misc/cardpeek { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; + cardpeek = callPackage ../applications/misc/cardpeek { }; ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests