diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/keepass')
4 files changed, 3 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/applications/misc/keepass/default.nix b/nixpkgs/pkgs/applications/misc/keepass/default.nix index 3a1393913ef..ea579ce4117 100644 --- a/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -68,7 +68,7 @@ with builtins; buildDotnetPackage rec { icon = "keepass"; desktopName = "Keepass"; genericName = "Password manager"; - categories = "Application;Utility;"; + categories = "Utility;"; mimeType = stdenv.lib.concatStringsSep ";" [ "application/x-keepass2" "" diff --git a/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch b/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch index 0a99f506b94..5ff36a21c00 100644 --- a/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch +++ b/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch @@ -56,24 +56,6 @@ diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Uni index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs +++ b/KeePass/Util/ClipboardUtil.Unix.cs -@@ -42,7 +42,7 @@ namespace KeePass.Util - // string strGtk = GtkGetString();
- // if(strGtk != null) return strGtk;
-
-- return (NativeLib.RunConsoleApp("pbpaste", "-pboard general") ??
-+ return (NativeLib.RunConsoleApp("@pbpaste@", "-pboard general") ??
- string.Empty);
- }
-
-@@ -50,7 +50,7 @@ namespace KeePass.Util - {
- // if(GtkSetString(str)) return;
-
-- NativeLib.RunConsoleApp("pbcopy", "-pboard general", str);
-+ NativeLib.RunConsoleApp("@pbcopy@", "-pboard general", str);
- }
-
- private static string GetStringU()
@@ -62,7 +62,7 @@ namespace KeePass.Util // "-out -selection clipboard");
// if(str != null) return str;
diff --git a/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch index ca52e7ef191..e6a6bff8dad 100644 --- a/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch @@ -1 +1 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); ++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", System.IO.SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch index 9a7e3fe9983..891be1ffa31 100644 --- a/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -11,7 +11,7 @@ diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs index 347eaf5..b92e1e2 100644 --- a/KeePass/Forms/MainForm.cs +++ b/KeePass/Forms/MainForm.cs -@@ -440,7 +440,7 @@ namespace KeePass.Forms +@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms ToolStripItemCollection tsicT = m_ctxTray.Items; ToolStripItem tsiPrevT = m_ctxTrayOptions; |