Fix non-determinism? Please

pedorich-n · Jun 11, 2024 · 319ff8d · 319ff8d
1 parent b7a88f4
commit 319ff8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/flake.nix b/flake.nix
@@ -38,7 +38,7 @@
 
           modrinth-pack = pkgs.callPackage ./nix/packwiz-modrinth.nix {
             src = self;
-            hash = "sha256-ie0Igriqj77fmhcRyJtUxqJKAI+db1+dNF3QgyVi7P4=";
+            hash = "sha256-isQlN/V2tWn8nrQQE72CLDtwSwzKGbAbSNcWARlozvo=";
           };
 
           # Not used for anything right now

diff --git a/nix/packwiz-modrinth.nix b/nix/packwiz-modrinth.nix
@@ -3,6 +3,7 @@
 , lib
 , stdenvNoCC
 , packwiz
+, strip-nondeterminism
 }:
 stdenvNoCC.mkDerivation (finalAttrs:
 let
@@ -21,16 +22,20 @@ in
 
   dontFixup = true;
 
-  buildInputs = [ packwiz ];
+  nativeBuildInputs = [ packwiz strip-nondeterminism ];
 
   buildPhase = ''
     runHook preBuild
 
     # Github Ation fails with "failed to create cache directory: mkdir /homeless-shelter: permission denied" if this is not set
     export HOME=$TMPDIR
 
+    result="$out/${resultName}"
+
     mkdir -p $out
-    packwiz modrinth export --output "$out/${resultName}"
+    packwiz modrinth export --output "$result"
+
+    strip-nondeterminism --type zip "$result"
 
     runHook postBuild
   '';