diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
| commit | 78b7529ee36603182ae34354d7cbc3dcfc228317 (patch) | |
| tree | 26a9555518aa403f9328dc1a72680e823e3630de /pkgs/tools/security | |
| parent | f3886a6fba7dec4d5c97a51558ab0a4489f89d76 (diff) | |
| parent | 4d4980d9f88956f533ecad905c92ab70f0e8cbad (diff) | |
| download | nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.gz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.bz2 nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.lz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.xz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.zst nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/pcsclite/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/stricat/default.nix | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 509a8a12092b..8116d0dfe9f9 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 }: +{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 +, IOKit ? null }: stdenv.mkDerivation rec { name = "pcsclite-${version}"; @@ -26,7 +27,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig perl python2 ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ] + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index 3dd00718af79..ecc34ede556b 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r"; }; + buildFlags = [ "CC=cc" ]; + installPhase = '' mkdir -p $out/bin mv stricat $out/bin |