Skip to content

volume_key: 0.3.10 → 0.3.11 #43709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtojnar merged 1 commit into from
Jul 18, 2018
Merged

volume_key: 0.3.10 → 0.3.11 #43709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions pkgs/development/libraries/volume-key/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; {
Expand Down