diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix deleted file mode 100644 index a7b0eed9037b..000000000000 --- a/pkgs/applications/misc/veracrypt/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, makeself -, yasm -, fuse -, wxGTK -, lvm2 -, substituteAll -, e2fsprogs -, exfat -, ntfs3g -, btrfs-progs -, pcsclite -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "veracrypt"; - version = "1.26.7"; - - src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "sha256-920nsYJBTg1P2ba1n76iiyXbb6afK7z/ouwmmxqGX2U="; - }; - - patches = [ - (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"; - }) - ]; - - sourceRoot = "src"; - - nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; - buildInputs = [ fuse lvm2 wxGTK pcsclite ]; - - enableParallelBuilding = true; - - installPhase = '' - install -Dm 755 Main/${pname} "$out/bin/${pname}" - install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm" - install -Dm 444 License.txt -t "$out/share/doc/${pname}/" - install -d $out/share/applications - 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 = with lib; { - description = "Free Open-Source filesystem on-the-fly encryption"; - homepage = "https://www.veracrypt.fr/"; - license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ]; - maintainers = with maintainers; [ dsferruzza ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/veracrypt/fix-paths.patch b/pkgs/by-name/ve/veracrypt/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/veracrypt/fix-paths.patch rename to pkgs/by-name/ve/veracrypt/fix-paths.patch diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix new file mode 100644 index 000000000000..fc41522a4b20 --- /dev/null +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + makeself, + yasm, + fuse, + wxGTK32, + lvm2, + substituteAll, + e2fsprogs, + exfat, + ntfs3g, + btrfs-progs, + pcsclite, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "veracrypt"; + version = "1.26.15"; + + src = fetchurl { + url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; + hash = "sha256-upcCUDDiG5sjMbfrCJcBFjwyr0t+BFNfM1uvjXSnSRY="; + }; + + patches = [ + (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"; + }) + ]; + + sourceRoot = "src"; + + nativeBuildInputs = [ + makeself + pkg-config + yasm + wrapGAppsHook3 + ]; + buildInputs = [ + fuse + lvm2 + wxGTK32 + pcsclite + ]; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm 755 Main/veracrypt "$out/bin/veracrypt" + install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/veracrypt.xpm" + install -Dm 444 License.txt -t "$out/share/doc/veracrypt/" + install -d $out/share/applications + substitute Setup/Linux/veracrypt.desktop $out/share/applications/veracrypt.desktop \ + --replace-fail "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ + --replace-fail "Icon=veracrypt" "Icon=veracrypt.xpm" + ''; + + meta = { + description = "Free Open-Source filesystem on-the-fly encryption"; + homepage = "https://www.veracrypt.fr/"; + license = with lib.licenses; [ + asl20 # and + unfree # TrueCrypt License version 3.0 + ]; + maintainers = with lib.maintainers; [ + dsferruzza + ryand56 + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea232b362614..4f735bd10f1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13846,10 +13846,6 @@ with pkgs; hitch = callPackage ../servers/hitch { }; - veracrypt = callPackage ../applications/misc/veracrypt { - wxGTK = wxGTK32; - }; - veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; viceroy = callPackage ../development/tools/viceroy {