Merge pull request #146210 from flurie/fix-cardpeek-darwin
cardpeek: fix build on darwin
This commit is contained in:
commit
5b14843fc9
2 changed files with 44 additions and 23 deletions
|
@ -1,9 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook,
|
||||
glib, gtk3, pcsclite, lua5_2, curl, readline }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, glib
|
||||
, gtk3
|
||||
, pcsclite
|
||||
, lua5_2
|
||||
, curl
|
||||
, readline
|
||||
, PCSC
|
||||
, xcbuild
|
||||
}:
|
||||
let
|
||||
version = "0.8.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation {
|
||||
pname = "cardpeek";
|
||||
inherit version;
|
||||
|
||||
|
@ -14,8 +26,17 @@ in
|
|||
sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.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'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ];
|
||||
buildInputs = [ glib gtk3 lua5_2 curl readline ]
|
||||
++ lib.optional stdenv.isDarwin PCSC
|
||||
++ lib.optional stdenv.isLinux pcsclite;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -26,4 +47,4 @@ in
|
|||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ embr ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2379,7 +2379,7 @@ with pkgs;
|
|||
|
||||
catclock = callPackage ../applications/misc/catclock { };
|
||||
|
||||
cardpeek = callPackage ../applications/misc/cardpeek { };
|
||||
cardpeek = callPackage ../applications/misc/cardpeek { inherit (darwin.apple_sdk.frameworks) PCSC; };
|
||||
|
||||
cawbird = callPackage ../applications/networking/cawbird { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue