about summary refs log tree commit diff
path: root/pkgs/games/hedgewars
diff options
context:
space:
mode:
authorNguyễn Gia Phong <mcsinyx@disroot.org>2022-07-17 02:02:26 +0900
committerFranz Pletz <fpletz@fnordicwalking.de>2022-07-19 13:33:04 +0200
commit310ce906b6aed2714787df92636ab284b2493a40 (patch)
treed5e6f0b5afa29b4137d29cb8ab4a52c3485bd9d7 /pkgs/games/hedgewars
parentc8585bf4a88d6ec2b659cf5fd02a10cac2d31c82 (diff)
hedgewars: use qt514's overridden glibc++
Diffstat (limited to 'pkgs/games/hedgewars')
-rw-r--r--pkgs/games/hedgewars/default.nix13
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index a45c4fee05ecc..d69ba93aaeb5f 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -1,7 +1,7 @@
-{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
+{ stdenv, 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
+, qtbase, qttools, wrapQtAppsHook
 , llvm
 , withServer ? true
 }:
@@ -14,7 +14,7 @@ let
         ]);
 
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "hedgewars";
   version = "1.0.0";
 
@@ -23,7 +23,7 @@ mkDerivation rec {
     sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1";
   };
 
-  nativeBuildInputs = [ cmake pkg-config qttools ];
+  nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
 
   buildInputs = [
     SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
@@ -103,10 +103,5 @@ mkDerivation rec {
        all movement on the battlefield has ceased).'';
     maintainers = with maintainers; [ kragniz fpletz ];
     inherit (fpc.meta) platforms;
-
-    # Appears to be some sort of C++ linking error.
-    # Example: https://hydra.nixos.org/build/174544990/nixlog/6
-    broken = true;
-    hydraPlatforms = platforms.none;
   };
 }