volume_key: 0.3.10 → 0.3.11
This commit is contained in:
parent
e8e96e4b72
commit
f76e421c55
@ -1,36 +1,27 @@
|
|||||||
{ stdenv, fetchgit, fetchpatch, autoreconfHook, pkgconfig, gettext, python2
|
{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
|
||||||
, swig, glib, utillinux, cryptsetup, nss, gpgme
|
, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.3.10";
|
version = "0.3.11";
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "volume_key-${version}";
|
name = "volume_key-${version}";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = https://pagure.io/volume_key.git;
|
url = https://pagure.io/volume_key.git;
|
||||||
rev = "ece1ce305234da454e330905c615ec474d9781c5";
|
rev = "volume_key-${version}";
|
||||||
sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva";
|
sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "man" "dev" "py" ];
|
outputs = [ "out" "man" "dev" "py" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ];
|
nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ];
|
||||||
|
|
||||||
buildInputs = [ glib cryptsetup nss utillinux gpgme ];
|
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 = [
|
makeFlags = [
|
||||||
"pyexecdir=$(py)/${python2.sitePackages}"
|
"pyexecdir=$(py)/${python3.sitePackages}"
|
||||||
"pythondir=$(py)/${python2.sitePackages}"
|
"pythondir=$(py)/${python3.sitePackages}"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user