diff options
author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-10-16 11:31:36 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-16 11:31:36 +0000 |
commit | e31942c71eef88a7188acc36b00c2a916d8774e6 (patch) | |
tree | 59e1df4827c7081e9cc90d23b515103210d43199 /pkgs/development | |
parent | a65f0b3d55d9b33086d258a6b563ccb4fd4ac6f2 (diff) | |
parent | 02602b2c15eaccf80490168591cf289ac81cc9d5 (diff) | |
download | nixlib-e31942c71eef88a7188acc36b00c2a916d8774e6.tar nixlib-e31942c71eef88a7188acc36b00c2a916d8774e6.tar.gz nixlib-e31942c71eef88a7188acc36b00c2a916d8774e6.tar.bz2 nixlib-e31942c71eef88a7188acc36b00c2a916d8774e6.tar.lz nixlib-e31942c71eef88a7188acc36b00c2a916d8774e6.tar.xz nixlib-e31942c71eef88a7188acc36b00c2a916d8774e6.tar.zst nixlib-e31942c71eef88a7188acc36b00c2a916d8774e6.zip |
Merge pull request #48282 from transumption/201810/qemu-smartcard
qemu: enable smartcard support
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libcacard/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/spice/default.nix | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix new file mode 100644 index 000000000000..f116360474e4 --- /dev/null +++ b/pkgs/development/libraries/libcacard/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, nss }: + +stdenv.mkDerivation rec { + name = "libcacard-${version}"; + version = "2.6.1"; + + src = fetchurl { + url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz"; + sha256 = "1w6y0kiakhg7dgyf8yqpm4jj6jiv17zhy9lp3d7z32q1pniccxk2"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib nss ]; + + meta = with stdenv.lib; { + description = "Smart card emulation library"; + homepage = https://gitlab.freedesktop.org/spice/libcacard; + license = licenses.lgpl21; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ba3791a8a8bd..e9b12d169849 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl -, lz4 }: +, libcacard, lz4 }: with stdenv.lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pixman celt alsaLib openssl libjpeg zlib libXrandr libXfixes libXrender libXext libXinerama - python pyparsing glib cyrus_sasl lz4 ]; + python pyparsing glib cyrus_sasl libcacard lz4 ]; nativeBuildInputs = [ pkgconfig spice-protocol ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sasl" - "--disable-smartcard" + "--enable-smartcard" "--enable-client" "--enable-lz4" ]; |