diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2019-11-01 09:46:59 +0100 |
---|---|---|
committer | Pavol Rusnak <pavol@rusnak.io> | 2019-11-03 11:33:54 +0100 |
commit | 17e7fb2fefd0f4356096014b35c0c627614bb41c (patch) | |
tree | f3ab3db664281d63f9801968798b46021780ca85 /pkgs/applications/misc/veracrypt | |
parent | 87955cb30ac75bcddd3af7ebab64361cee9dfdd3 (diff) |
veracrypt: 1.23-Hotfix-2 -> 1.24-Hotfix1
Diffstat (limited to 'pkgs/applications/misc/veracrypt')
-rw-r--r-- | pkgs/applications/misc/veracrypt/default.nix | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 9639cee2d8c75..fe1de349cff92 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,21 +1,36 @@ -{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, unzip, wxGTK, lvm2 }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }: with stdenv.lib; stdenv.mkDerivation rec { pname = "veracrypt"; - version = "1.23"; - minorVersion = "-Hotfix-2"; + version = "1.24-Hotfix1"; src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}${minorVersion}_Source.zip"; - sha256 = "229de81b2478cfa5fa73e74e60798a298cd616e9852b9f47b484c80bc2a2c259"; + url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; + sha256 = "8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c"; }; + + 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; + }) + ]; + sourceRoot = "src"; nativeBuildInputs = [ makeself pkgconfig yasm ]; - buildInputs = [ fuse lvm2 unzip wxGTK ]; + buildInputs = [ fuse lvm2 wxGTK ]; enableParallelBuilding = true; |