Merge pull request #122698 from spacefrogg/gencfs-19

gencfsm: 1.8.19 -> 1.9
This commit is contained in:
Sandro 2021-05-12 14:58:02 +02:00 committed by GitHub
commit 1c0b5fe39d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,21 +1,39 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs { lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config
, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection , encfs, libsecret , glib , libgee, gtk3, vala, wrapGAppsHook, xorg
, gobject-introspection
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.8.19"; version = "1.9";
pname = "gnome-encfs-manager"; pname = "gnome-encfs-manager";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz"; url = with lib.versions;
sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i"; "https://launchpad.net/gencfsm/trunk/${major version}.${minor version}/+download/gnome-encfs-manager_${version}.tar.xz";
sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [
buildInputs = [ autoconf automake intltool libtool vala glib encfs autoconf
gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE automake
wrapGAppsHook gobject-introspection ]; intltool
libtool
pkg-config
vala
wrapGAppsHook
];
buildInputs = [
glib
encfs
gtk3
libgee
xorg.libSM
xorg.libICE
gobject-introspection
libsecret
];
# Fix hardcoded paths to /bin/mkdir
patches = [ ./makefile-mkdir.patch ]; patches = [ ./makefile-mkdir.patch ];
preConfigure = '' preConfigure = ''