gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

veracrypt: 1.26.18 -> 1.26.20, fix bug with system paths/sudo detection (#377198)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-02-09 16:11:42 +01:00
committed by GitHub
parent 1062180ece f97326d605
commit 34ff1095d0
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ve/veracrypt/nix-system-paths.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/Platform/Unix/Process.cpp b/Platform/Unix/Process.cpp
index 395d4bc..18601ad 100644
--- a/Platform/Unix/Process.cpp
+++ b/Platform/Unix/Process.cpp
@@ -52,7 +52,7 @@ namespace VeraCrypt
#elif TC_OPENBSD
const char* defaultDirs[] = {"/sbin", "/bin", "/usr/sbin", "/usr/bin", "/usr/X11R6/bin", "/usr/local/sbin", "/usr/local/bin"};
#else
- const char* defaultDirs[] = {"/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin"};
+ const char* defaultDirs[] = {"/run/wrappers/bin", "/run/current-system/sw/bin", "/nix/var/nix/profiles/default/bin", "/etc/profiles/per-user/$USER", "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin"};
#endif
const size_t defaultDirCount = sizeof(defaultDirs) / sizeof(defaultDirs[0]);
pkgs/by-name/ve/veracrypt/package.nix
+5 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "veracrypt";
version = "1.26.18";
version = "1.26.20";
src = fetchurl {
url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2";
hash = "sha256-fWmvHvYCgHQi50CsjMKaGHFzw4vPYZLl7GqL3tO5XBw=";
hash = "sha256-qhVmQPigzEPuPe3aO8g3lR3HRPLEvdhaXfZAZ4IosRY=";
};
patches = [
@@ -35,6 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
ntfs = "${ntfs3g}/bin/mkfs.ntfs";
btrfs = "${btrfs-progs}/bin/mkfs.btrfs";
})
# https://github.com/veracrypt/VeraCrypt/commit/2cca2e1dafa405addc3af8724baf8563f352ac1c
./nix-system-paths.patch
];
sourceRoot = "src";