tjh.dev
keepass: 2.53.1 -> 2.54
+2
-2
pkgs/applications/misc/keepass/default.nix
+2
-2
pkgs/applications/misc/keepass/default.nix
···
4
4
inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;
5
5
in buildDotnetPackage rec {
6
6
pname = "keepass";
7
-
version = "2.53.1";
7
+
version = "2.54";
8
8
9
9
src = fetchurl {
10
10
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
11
-
hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM=";
11
+
hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg=";
12
12
};
13
13
14
14
sourceRoot = ".";
+30
-31
pkgs/applications/misc/keepass/fix-paths.patch
+30
-31
pkgs/applications/misc/keepass/fix-paths.patch
···
53
53
54
54
int iSep = str.IndexOf(':');
55
55
diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs
56
-
index ab49ee2..7f6c50f 100644
57
56
--- a/KeePass/Util/ClipboardUtil.Unix.cs
58
57
+++ b/KeePass/Util/ClipboardUtil.Unix.cs
59
-
@@ -62,7 +62,7 @@ namespace KeePass.Util
60
-
// "-out -selection clipboard");
61
-
// if(str != null) return str;
58
+
@@ -65,7 +65,7 @@
59
+
// "-out -selection clipboard");
60
+
// if(str != null) return str;
62
61
63
-
- string str = NativeLib.RunConsoleApp("xsel",
64
-
+ string str = NativeLib.RunConsoleApp("@xsel@",
65
-
"--output --clipboard", null, XSelFlags);
66
-
if(str != null) return str;
62
+
- string str = NativeLib.RunConsoleApp("xsel",
63
+
+ string str = NativeLib.RunConsoleApp("@xsel@",
64
+
"--output --clipboard", null, XSelFlags);
65
+
if(str != null) return str;
66
+
}
67
+
@@ -93,10 +93,10 @@
68
+
if(string.IsNullOrEmpty(str))
69
+
{
70
+
// xsel with an empty input can hang, thus use --clear
71
+
- if(NativeLib.RunConsoleApp("xsel", "--clear --primary",
72
+
+ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary",
73
+
null, XSelFlags) != null)
74
+
{
75
+
- NativeLib.RunConsoleApp("xsel", "--clear --clipboard",
76
+
+ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard",
77
+
null, XSelFlags);
78
+
return;
79
+
}
80
+
@@ -107,10 +107,10 @@
81
+
}
67
82
68
-
@@ -83,10 +83,10 @@ namespace KeePass.Util
69
-
if(string.IsNullOrEmpty(str))
70
-
{
71
-
// xsel with an empty input can hang, thus use --clear
72
-
- if(NativeLib.RunConsoleApp("xsel", "--clear --primary",
73
-
+ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary",
74
-
null, XSelFlags) != null)
83
+
// xsel does not support --primary and --clipboard together
84
+
- if(NativeLib.RunConsoleApp("xsel", "--input --primary",
85
+
+ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary",
86
+
str, XSelFlags) != null)
75
87
{
76
-
- NativeLib.RunConsoleApp("xsel", "--clear --clipboard",
77
-
+ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard",
78
-
null, XSelFlags);
88
+
- NativeLib.RunConsoleApp("xsel", "--input --clipboard",
89
+
+ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard",
90
+
str, XSelFlags);
79
91
return;
80
92
}
81
-
@@ -97,10 +97,10 @@ namespace KeePass.Util
82
-
}
83
-
84
-
// xsel does not support --primary and --clipboard together
85
-
- if(NativeLib.RunConsoleApp("xsel", "--input --primary",
86
-
+ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary",
87
-
str, XSelFlags) != null)
88
-
{
89
-
- NativeLib.RunConsoleApp("xsel", "--input --clipboard",
90
-
+ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard",
91
-
str, XSelFlags);
92
-
return;
93
-
}
94
93
diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs
95
94
index 291c51d..3c76380 100644
96
95
--- a/KeePassLib/Native/ClipboardU.cs