public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97031 from timokau/hedgewars-aarch64

Browse Source 
hedgewars: fix build on aarch64
This commit is contained in:
Jörg Thalheim 2020-09-03 19:36:40 +01:00 committed by GitHub
commit 96ea00a5ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/hedgewars/default.nix
View File

@ -2,6 +2,7 @@
, lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs , zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools , qtbase, qttools
, llvm
, withServer ? true , withServer ? true
}: }:
@ -27,6 +28,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
fpc lua5_1 fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg_3 freeglut physfs ffmpeg_3 freeglut physfs
qtbase qtbase
] ++ lib.optional withServer ghc; ] ++ lib.optional withServer ghc;