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

veracrypt: 1.22 -> 1.23 

Removed the wxGUI switch because it was never working.
To build VeraCrypt text-only you still need wxGTK _and_ you need to
rebuild wxGTK without GUI too...
Moreover, the normal build provides both GUI and text-only interfaces
so it is already usable in pure CLI contexts.
This commit is contained in:
c0bw3b 2018-10-24 20:57:03 +02:00
parent b47fccff0a
commit ce67a63dbe
2 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/applications/misc/veracrypt/default.nix
View File

@ -1,43 +1,38 @@
{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself, { stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }:
wxGUI ? true
}:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "veracrypt-${version}"; pname = "veracrypt";
version = "1.22"; name = "${pname}-${version}";
version = "1.23";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2"; url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y"; sha256 = "009lqi43n2w272sxv7y7dz9sqx15qkx6lszkswr8mwmkpgkm0px1";
}; };
unpackPhase = sourceRoot = "src";
''
tar xjf $src
cd src
'';
nativeBuildInputs = [ makeself yasm pkgconfig ]; nativeBuildInputs = [ makeself pkgconfig yasm ];
buildInputs = [ fuse lvm2 ] buildInputs = [ fuse lvm2 wxGTK ];
++ optional wxGUI wxGTK30;
makeFlags = optionalString (!wxGUI) "NOGUI=1";
installPhase = enableParallelBuilding = true;
''
mkdir -p $out/bin installPhase = ''
cp Main/veracrypt $out/bin install -Dm 755 Main/${pname} "$out/bin/${pname}"
mkdir -p $out/share/$name install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm"
cp License.txt $out/share/$name/LICENSE install -Dm 444 License.txt -t "$out/share/doc/${pname}/"
mkdir -p $out/share/applications install -d $out/share/applications
sed "s,Exec=.*,Exec=$out/bin/veracrypt," Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \
''; --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \
--replace "Icon=veracrypt" "Icon=veracrypt.xpm"
'';
meta = { meta = {
description = "Free Open-Source filesystem on-the-fly encryption"; description = "Free Open-Source filesystem on-the-fly encryption";
homepage = https://www.veracrypt.fr/; homepage = https://www.veracrypt.fr/;
license = "VeraCrypt License"; license = [ licenses.asl20 /* or */ "TrueCrypt License version 3.0" ];
maintainers = with maintainers; [ dsferruzza ]; maintainers = with maintainers; [ dsferruzza ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -6117,7 +6117,7 @@ with pkgs;
}; };
veracrypt = callPackage ../applications/misc/veracrypt { veracrypt = callPackage ../applications/misc/veracrypt {
wxGUI = true; wxGTK = wxGTK30;
}; };
vlan = callPackage ../tools/networking/vlan { }; vlan = callPackage ../tools/networking/vlan { };