diff options
author | Peter Simons <simons@cryp.to> | 2009-01-12 21:12:07 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2009-01-12 21:12:07 +0000 |
commit | 6fb297513a8096081a598620fc9260aaba9b86d7 (patch) | |
tree | 3b69b6f794a5ab254268c1430ddd5fc3fb143afb /pkgs/applications/misc/truecrypt | |
parent | 4080ba42c5a4fd853b9ce668f1addf38d5535c44 (diff) | |
download | nixlib-6fb297513a8096081a598620fc9260aaba9b86d7.tar nixlib-6fb297513a8096081a598620fc9260aaba9b86d7.tar.gz nixlib-6fb297513a8096081a598620fc9260aaba9b86d7.tar.bz2 nixlib-6fb297513a8096081a598620fc9260aaba9b86d7.tar.lz nixlib-6fb297513a8096081a598620fc9260aaba9b86d7.tar.xz nixlib-6fb297513a8096081a598620fc9260aaba9b86d7.tar.zst nixlib-6fb297513a8096081a598620fc9260aaba9b86d7.zip |
Committing Lluís Batlle's submissions from mailing list posting
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>: * nixpkgs-ccrypt-1.7-new.patch * nixpkgs-cmake-add-ccmake.patch * nixpkgs-cpufrequtils-005-new.patch * nixpkgs-dwm-5.1-fix.patch * nixpkgs-freeimage-3.11.0-new.patch * nixpkgs-proxychains-3.1-new.patch * nixpkgs-psi-to-0.12.patch * nixpkgs-skype-to-2.0.0.72.patch * nixpkgs-truecrypt-6.1a-fix.patch * nixpkgs-vxl-1.11.0-new.patch * nixpkgs-xkb-popular-esperanto-symbols.patch * nixpkgs-xorg-via-video-fix.patch svn path=/nixpkgs/trunk/; revision=13751
Diffstat (limited to 'pkgs/applications/misc/truecrypt')
-rw-r--r-- | pkgs/applications/misc/truecrypt/builder.sh | 18 | ||||
-rw-r--r-- | pkgs/applications/misc/truecrypt/default.nix | 34 |
2 files changed, 33 insertions, 19 deletions
diff --git a/pkgs/applications/misc/truecrypt/builder.sh b/pkgs/applications/misc/truecrypt/builder.sh index 71fcc0f94e2a..88820d4cad21 100644 --- a/pkgs/applications/misc/truecrypt/builder.sh +++ b/pkgs/applications/misc/truecrypt/builder.sh @@ -1,15 +1,15 @@ source $stdenv/setup -# PATH=$perl/bin:$PATH - -tar zxvf $wxWidgets - -# we need the absolute path, relative will not work -wxwdir=$(pwd)/wxX11-* - tar xvfz $src cd truecrypt-* -make WX_ROOT=$wxwdir wxbuild -make +cp $pkcs11h pkcs11.h +cp $pkcs11th pkcs11t.h +cp $pkcs11fh pkcs11f.h + +make PKCS11_INC="`pwd`" +mkdir -p $out/bin +cp Main/truecrypt $out/bin +mkdir -p $out/share/$name +cp License.txt $out/share/$name/LICENSE diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index e1ac3dd35066..1cd7eb2c237c 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -40,24 +40,38 @@ library, use the 'NOGUI' parameter: $ make NOGUI=1 */ -{ fetchurl, stdenv, pkgconfig, fuse, gtk, libSM, glibc +{ fetchurl, stdenv, pkgconfig, fuse, wxGTK, devicemapper }: stdenv.mkDerivation { - name = "trueCrypt-6.0a"; + name = "trueCrypt-6.1a"; builder = ./builder.sh; src = fetchurl { - url = http://www.sfr-fresh.com/unix/misc/TrueCrypt-6.0a-Source.tar.gz; - sha256 = "dea0ac2f1f6964d7e88f6751fa9f0a89d0dbfb957e9a557e8dee48492d0b4fac"; + url = http://www.sfr-fresh.com/unix/misc/TrueCrypt-6.1a-Source.tar.gz; + sha256 = "a2bb8273edcb3c3d10d9819daac853f940033deb1f9726986311356bd5b88c4a"; }; - wxWidgets = fetchurl { - url = mirror://sourceforge/wxwindows/wxX11-2.8.8.tar.gz; - sha256 = "85e1a458fd9523c68b22af0a51eb507b792894e9ba58a560f9dbe7b6faa6f625"; + pkcs11h = fetchurl { + url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11.h; + sha256 = "1563d877b6f8868b8eb8687358162bfb7f868104ed694beb35ae1c5cf1a58b9b"; }; - buildInputs = [pkgconfig fuse gtk libSM glibc]; - #configureFlags = - #postInstall = " + pkcs11th = fetchurl { + url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11t.h; + sha256 = "8ce68616304684f92a7e267bcc8f486441e92a5cbdfcfd97e69ac9a0b436fb7b"; + }; + + pkcs11fh = fetchurl { + url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11f.h; + sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8"; + }; + + buildInputs = [pkgconfig fuse wxGTK devicemapper]; + + meta = { + description = "Free Open-Source filesystem on-the-fly encryption"; + homepage = http://www.truecrypt.org/; + license = "TrueCrypt License Version 2.6"; + }; } |