Merge pull request #43709 from jtojnar/volume-key-0.3.11
volume_key: 0.3.10 → 0.3.11
This commit is contained in:
commit
c21b6930bd
1 changed files with 8 additions and 17 deletions
|
@ -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; {
|
||||
|
|
Loading…
Reference in a new issue