diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2021-07-28 09:43:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 09:43:37 +0200 |
| commit | a293e46365e5c316509067a3388149bce95befef (patch) | |
| tree | 600182b290792b262575b4465ee08fab68a8c5fa | |
| parent | d1c93d30c7515fe3d98b3be0db333570a64e0ab3 (diff) | |
| parent | f65e1d8793c76766c45d04a507196dbff4a4e10f (diff) | |
| download | nixpkgs-a293e46365e5c316509067a3388149bce95befef.tar nixpkgs-a293e46365e5c316509067a3388149bce95befef.tar.gz nixpkgs-a293e46365e5c316509067a3388149bce95befef.tar.bz2 nixpkgs-a293e46365e5c316509067a3388149bce95befef.tar.lz nixpkgs-a293e46365e5c316509067a3388149bce95befef.tar.xz nixpkgs-a293e46365e5c316509067a3388149bce95befef.tar.zst nixpkgs-a293e46365e5c316509067a3388149bce95befef.zip | |
Merge pull request #131735 from svanderburg/fix-ecwolf-darwin
ecwolf: fix compilation on darwin
| -rw-r--r-- | pkgs/games/ecwolf/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 519398a738b..b7bb382db83 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h + '' + # Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store + + lib.optionalString (stdenv.isDarwin) '' + sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt ''; # Install the required PK3 file in the required data directory @@ -46,7 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://maniacsvault.net/ecwolf/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; - # Darwin is untested (supported by upstream) platforms = platforms.all; }; } |