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

Merge branch 'master' into haskell-updates

Browse Source
This commit is contained in:
Malte Brandy
2021-05-07 15:03:54 +02:00
parent f73c2278d0 ae1c8ede09
commit 2a11f1f5cc
560 changed files with 8180 additions and 4731 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/hedgewars/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut
{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools
@@ -29,7 +29,7 @@ mkDerivation rec {
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg_3 freeglut physfs
ffmpeg freeglut physfs
qtbase
] ++ lib.optional withServer ghc;