BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

veracrypt: 1.24-Hotfix1 -> 1.24-Update7 and hardcode mkfs paths (#127592)

Browse source
This commit is contained in:
Artturi 2021-06-20 22:20:08 +03:00 committed by GitHub
parent 10ae47c379
commit 8e4a27fa42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pkgs/applications/misc/veracrypt/default.nix
View file

@ -1,29 +1,39 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeself, yasm, fuse, wxGTK, lvm2 }:
{ lib
, stdenv
, fetchurl
, pkg-config
, makeself
, yasm
, fuse
, wxGTK
, lvm2
, substituteAll
, e2fsprogs
, exfat
, ntfs3g
, btrfs-progs
}:
with lib;
stdenv.mkDerivation rec {
pname = "veracrypt";
version = "1.24-Hotfix1";
version = "1.24-Update7";
src = fetchurl {
url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2";
sha256 = "8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c";
sha256 = "0i7h44zn2mjzgh416l7kfs0dk6qc7b1bxsaxqqqcvgrpl453n7bc";
};
patches = [
# https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86
(fetchpatch {
url = "https://github.com/veracrypt/VeraCrypt/commit/afe6b2f45b15393026a1159e5f3d165ac7d0b94a.patch";
sha256 = "1xm9cl6zinlr0vah5xr9bvh0y9gw4331zl7d2n5xvqrcdxw3ww1y";
stripLen = 1;
})
# https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86
(fetchpatch {
url = "https://github.com/veracrypt/VeraCrypt/commit/3fa636d477119fff6e372074568edb42d038f508.patch";
sha256 = "0qsccilip0ksnlzxina38a052gb533r4s422lxhrj3wv9zgpp7l3";
stripLen = 1;
(substituteAll {
src = ./fix-paths.patch;
ext2 = "${e2fsprogs}/bin/mkfs.ext2";
ext3 = "${e2fsprogs}/bin/mkfs.ext3";
ext4 = "${e2fsprogs}/bin/mkfs.ext4";
exfat = "${exfat}/bin/mkfs.exfat";
ntfs = "${ntfs3g}/bin/mkfs.ntfs";
btrfs = "${btrfs-progs}/bin/mkfs.btrfs";
})
];

22
pkgs/applications/misc/veracrypt/fix-paths.patch Normal file
View file

@ -0,0 +1,22 @@
diff --color --unified --recursive --text a/Core/VolumeCreator.h b/Core/VolumeCreator.h
--- a/Core/VolumeCreator.h 2021-06-20 20:54:50.725210056 +0300
+++ b/Core/VolumeCreator.h 2021-06-20 20:58:46.117742419 +0300
@@ -77,12 +77,12 @@
switch (fsType)
{
#if defined (TC_LINUX)
- case VolumeCreationOptions::FilesystemType::Ext2: return "mkfs.ext2";
- case VolumeCreationOptions::FilesystemType::Ext3: return "mkfs.ext3";
- case VolumeCreationOptions::FilesystemType::Ext4: return "mkfs.ext4";
- case VolumeCreationOptions::FilesystemType::NTFS: return "mkfs.ntfs";
- case VolumeCreationOptions::FilesystemType::exFAT: return "mkfs.exfat";
- case VolumeCreationOptions::FilesystemType::Btrfs: return "mkfs.btrfs";
+ case VolumeCreationOptions::FilesystemType::Ext2: return "@ext2@";
+ case VolumeCreationOptions::FilesystemType::Ext3: return "@ext3@";
+ case VolumeCreationOptions::FilesystemType::Ext4: return "@ext4@";
+ case VolumeCreationOptions::FilesystemType::NTFS: return "@ntfs@";
+ case VolumeCreationOptions::FilesystemType::exFAT: return "@exfat@";
+ case VolumeCreationOptions::FilesystemType::Btrfs: return "@btrfs@";
#elif defined (TC_MACOSX)
case VolumeCreationOptions::FilesystemType::MacOsExt: return "newfs_hfs";
case VolumeCreationOptions::FilesystemType::exFAT: return "newfs_exfat";