1 files changed, 27 insertions, 18 deletions

diff --git a/modules/by-name/bo/boot/tails_iso.nix b/pkgs/by-name/ta/tails-iso/package.nix
index 03f97577..87bfd0b2 100644
--- a/modules/by-name/bo/boot/tails_iso.nix
+++ b/pkgs/by-name/ta/tails-iso/package.nix
@@ -7,22 +7,28 @@
 #
 # You should have received a copy of the License along with this program.
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{pkgs ? (builtins.getFlake "nixpkgs").legacyPackages."x86_64-linux"}: let
-  version = "7.8";
-  checked_iso = pkgs.stdenv.mkDerivation (finalAttrs: {
-    pname = "tails-iso";
-    version = "amd64-${version}";
+{
+  stdenv,
+  fetchurl,
+  sequoia-sq,
+  libarchive, # for bsdtar
+}: let
+  files = builtins.fromJSON (builtins.readFile (./files.json));
+
+  checked_iso = stdenv.mkDerivation (finalAttrs: {
+    pname = "raw-tails-iso";
+    version = "amd64-${files.version}";
 
     srcs = [
-      (pkgs.fetchurl {
+      (fetchurl {
         url = "https://tails.net/torrents/files/tails-${finalAttrs.version}.iso.sig";
-        hash = "sha256-58vDQdXQYYqeVUHzupmDPtVVpSrxtT25+gwHe2OfvkA=";
+        hash = files.files."iso.sig";
       })
-      (pkgs.fetchurl {
+      (fetchurl {
         url = "https://download.tails.net/tails/stable/tails-${finalAttrs.version}/tails-${finalAttrs.version}.iso";
-        hash = "sha256-ewLHQ+3iI3aHgvKdBgysQ9QAudQ7AM83WP+VdYFmxt0=";
+        hash = files.files."iso";
       })
-      (pkgs.fetchurl {
+      (fetchurl {
         url = "https://tails.net/tails-signing.key";
         hash = "sha256-OwdqyM7o7K6F5Km0U1RU3hzsnaT+Yw0sjQk/thMeq1k=";
       })
@@ -31,7 +37,7 @@
     dontUnpack = true;
 
     nativeBuildInputs = [
-      pkgs.sequoia-sq
+      sequoia-sq
     ];
 
     buildPhase =
@@ -54,15 +60,16 @@
     '';
   });
 in
-  pkgs.stdenv.mkDerivation {
-    name = "live_iso_boot_entry";
+  stdenv.mkDerivation {
+    pname = "tails-iso-package";
+    inherit (checked_iso) version;
 
     src = checked_iso;
 
     dontUnpack = true;
 
-    nativeBuildInputs = with pkgs; [
-      libarchive # for bsdtar
+    nativeBuildInputs = [
+      libarchive
     ];
 
     buildPhase = ''
@@ -71,12 +78,14 @@ in
     '';
 
     passthru = {
-      inherit version;
+      inherit (files) version;
     };
 
     installPhase = ''
+      install -D "$src" "$out/tails.iso"
+      install -D ./iso/live/vmlinuz "$out/live/vmlinuz-linux"
       install -D ./iso/live/initrd.img "$out/live/initrd.img"
-      install -D ./iso/live/vmlinuz "$out/live/vmlinuz"
-      install -D ./iso/live/filesystem.squashfs "$out/live/filesystem.squashfs"
+
+      chmod --recursive -x $out/tails.iso $out/live/*
     '';
   }