summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raitza <michael.raitza@tu-dresden.de>2021-05-12 12:07:36 +0200
committerMichael Raitza <michael.raitza@tu-dresden.de>2021-05-12 13:58:05 +0200
commitc818dec738baed9540cb4b459cbd6e8062a22cf7 (patch)
treea7f4fdb2f9f35e308e9958bbc14cfa346cf6dbb2
parent4bb3b2a23f9c08d1766d77e22821ced99a08c63e (diff)
downloadnixpkgs-c818dec738baed9540cb4b459cbd6e8062a22cf7.tar
nixpkgs-c818dec738baed9540cb4b459cbd6e8062a22cf7.tar.gz
nixpkgs-c818dec738baed9540cb4b459cbd6e8062a22cf7.tar.bz2
nixpkgs-c818dec738baed9540cb4b459cbd6e8062a22cf7.tar.lz
nixpkgs-c818dec738baed9540cb4b459cbd6e8062a22cf7.tar.xz
nixpkgs-c818dec738baed9540cb4b459cbd6e8062a22cf7.tar.zst
nixpkgs-c818dec738baed9540cb4b459cbd6e8062a22cf7.zip
gencfsm: 1.8.19 -> 1.9
ZHF: #122042
-rw-r--r--pkgs/tools/security/gencfsm/default.nix38
1 files changed, 28 insertions, 10 deletions
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index edec05272b9..4cf5338ca2e 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,21 +1,39 @@
-{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
-, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
+{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config
+, encfs, libsecret , glib , libgee, gtk3, vala, wrapGAppsHook, xorg
+, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.19";
+  version = "1.9";
   pname = "gnome-encfs-manager";
 
   src = fetchurl {
-    url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
-    sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i";
+    url = with lib.versions;
+      "https://launchpad.net/gencfsm/trunk/${major version}.${minor version}/+download/gnome-encfs-manager_${version}.tar.xz";
+    sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ autoconf automake intltool libtool vala glib encfs
-    gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
-    wrapGAppsHook gobject-introspection  ];
-
+  nativeBuildInputs = [
+    autoconf
+    automake
+    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 ];
 
   preConfigure = ''