diff options
author | K900 <me@0upti.me> | 2024-01-12 13:59:54 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2024-01-12 13:59:54 +0300 |
commit | e7b611e59d74da47047dee062aec1c50ac0823ca (patch) | |
tree | 762982cd2f5ba7f7a02bab598d9db7ac837e04b3 /pkgs/games | |
parent | 9490738be7b6a33844e4faf192f168bb755539e6 (diff) | |
parent | 96478c43ec80609cd6da1385560eb0bf0a4e27ea (diff) | |
download | nixlib-e7b611e59d74da47047dee062aec1c50ac0823ca.tar nixlib-e7b611e59d74da47047dee062aec1c50ac0823ca.tar.gz nixlib-e7b611e59d74da47047dee062aec1c50ac0823ca.tar.bz2 nixlib-e7b611e59d74da47047dee062aec1c50ac0823ca.tar.lz nixlib-e7b611e59d74da47047dee062aec1c50ac0823ca.tar.xz nixlib-e7b611e59d74da47047dee062aec1c50ac0823ca.tar.zst nixlib-e7b611e59d74da47047dee062aec1c50ac0823ca.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/hedgewars/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 94f8a28add9b..763dc3f63a6c 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut +{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools, wrapQtAppsHook @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ - SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image + SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6 fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 ffmpeg_4 freeglut physfs @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ SDL2.out - SDL2_image + SDL2_image_2_6 SDL2_mixer SDL2_net SDL2_ttf |