diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e82a5b3..ea3803f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@main - name: Enter shell with needed dependencies run: | - nix shell --inputs-from . nixpkgs#jq nixpkgs#p7zip nixpkgs#git nixpkgs#findutils + nix shell --inputs-from . nixpkgs#jq nixpkgs#_7zz nixpkgs#git nixpkgs#findutils - name: Update Doom2D related inputs run: | nix flake update d2df-sdl d2df-editor doom2df-res @@ -65,7 +65,7 @@ jobs: cp -r build/doom2df-win32/bin/* doom2df-win32 cp -r build/doom2df-win32/assets/* doom2df-win32 - 7z a -tzip doom2df-win32.zip -w doom2df-win32/. + nix run --inputs-from . nixpkgs#_7zz -- a -mtc -mta -mtm -stl -ssp -tzip doom2df-win32.zip -w doom2df-win32/. - uses: actions/upload-artifact@v4 with: name: doom2df-win32 diff --git a/flake.nix b/flake.nix index d16eac2..4e3f840 100755 --- a/flake.nix +++ b/flake.nix @@ -145,6 +145,10 @@ bash alejandra nixd + jq + _7zz + git + findutils ]; }; });