diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-18 03:00:42 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-07-18 03:00:42 +0200 |
commit | f76e421c55cfc2d2411da14219b45f44600e405b (patch) | |
tree | ed2434cb4cb2974e31a1f65008c9e2ca88721b5e /pkgs | |
parent | e8e96e4b7290471f91f5828734d93945ec26ba2a (diff) | |
download | nixlib-f76e421c55cfc2d2411da14219b45f44600e405b.tar nixlib-f76e421c55cfc2d2411da14219b45f44600e405b.tar.gz nixlib-f76e421c55cfc2d2411da14219b45f44600e405b.tar.bz2 nixlib-f76e421c55cfc2d2411da14219b45f44600e405b.tar.lz nixlib-f76e421c55cfc2d2411da14219b45f44600e405b.tar.xz nixlib-f76e421c55cfc2d2411da14219b45f44600e405b.tar.zst nixlib-f76e421c55cfc2d2411da14219b45f44600e405b.zip |
volume_key: 0.3.10 → 0.3.11
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/volume-key/default.nix | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 4dd01f664d19..a8515975c353 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,36 +1,27 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook, pkgconfig, gettext, python2 -, swig, glib, utillinux, cryptsetup, nss, gpgme +{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 +, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme }: let - version = "0.3.10"; + version = "0.3.11"; in stdenv.mkDerivation rec { name = "volume_key-${version}"; src = fetchgit { url = https://pagure.io/volume_key.git; - rev = "ece1ce305234da454e330905c615ec474d9781c5"; - sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva"; + rev = "volume_key-${version}"; + sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma"; }; outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ]; buildInputs = [ glib cryptsetup nss utillinux gpgme ]; - patches = [ - # Use pkg-config for locating Python.h - # https://pagure.io/volume_key/pull-request/12 - (fetchpatch { - url = https://pagure.io/fork/cathay4t/volume_key/c/8eda66d3b734ea335e37cf9d7d173b9e8ebe2fd9.patch; - sha256 = "01lr1zijk0imkk681zynm4w5ad3y6c9vdrmrzaib7w7ima75iczr"; - }) - ]; - makeFlags = [ - "pyexecdir=$(py)/${python2.sitePackages}" - "pythondir=$(py)/${python2.sitePackages}" + "pyexecdir=$(py)/${python3.sitePackages}" + "pythondir=$(py)/${python3.sitePackages}" ]; meta = with stdenv.lib; { |