about summary refs log tree commit diff
path: root/pkgs/games/mindustry
diff options
context:
space:
mode:
authorScott Worley <scottworley@scottworley.com>2022-10-28 11:03:25 -0700
committerScott Worley <scottworley@scottworley.com>2022-11-17 17:16:05 -0800
commit138be4cfbbe219de1be4f896b633f6cad5fdbed3 (patch)
tree6ee495affb3edd3e4003a755bf36147548d99a42 /pkgs/games/mindustry
parent3cd3cbd2d3869f59f01046dbdbb633697b920ef7 (diff)
mindustry: More uniform source cleanup
Diffstat (limited to 'pkgs/games/mindustry')
-rw-r--r--pkgs/games/mindustry/default.nix18
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index 2605862f7edc9..2a3177fdb9db8 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -91,14 +91,14 @@ let
   };
 
   cleanupMindustrySrc = ''
-    pushd Mindustry
+    # Ensure the prebuilt shared objects don't accidentally get shipped
+    rm -r Arc/natives/natives-*/libs/*
+    rm -r Arc/backends/backend-*/libs/*
 
     # Remove unbuildable iOS stuff
-    sed -i '/^project(":ios"){/,/^}/d' build.gradle
-    sed -i '/robo(vm|VM)/d' build.gradle
-    rm ios/build.gradle
-
-    popd
+    sed -i '/^project(":ios"){/,/^}/d' Mindustry/build.gradle
+    sed -i '/robo(vm|VM)/d' Mindustry/build.gradle
+    rm Mindustry/ios/build.gradle
   '';
 
   # fake build to pre-download deps into fixed-output derivation
@@ -134,11 +134,7 @@ assert lib.assertMsg (enableClient || enableServer)
 stdenv.mkDerivation rec {
   inherit pname version unpackPhase patches;
 
-  postPatch = ''
-    # ensure the prebuilt shared objects don't accidentally get shipped
-    rm -r Arc/natives/natives-*/libs/*
-    rm -r Arc/backends/backend-*/libs/*
-  '' + cleanupMindustrySrc;
+  postPatch = cleanupMindustrySrc;
 
   buildInputs = lib.optionals enableClient [
     SDL2