git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #87050 from rardiol/hedgewars

Hedgewars server fix haskell

commit01a1423ddfae052f85dd144d1649f0a5cb7d6885 authorPeter Simons <simons@cryp.to> dateFri 8 May 2020, 21:03 (7 years ago) parent72654dcae77b8f
2 files changed+12−1
pkgs/development/haskell-modules/configuration-common.nix+1 pkgs/games/hedgewars/default.nix+11−1
pkgs/development/haskell-modules/configuration-common.nix+1
@@ -333,6 +333,7 @@ self: super: {
333333 nats-queue = dontCheck super.nats-queue;
334334 netpbm = dontCheck super.netpbm;
335335 network = dontCheck super.network;
336+ network_2_6_3_1 = dontCheck super.network_2_6_3_1;
336337 network-dbus = dontCheck super.network-dbus;
337338 notcpp = dontCheck super.notcpp;
338339 ntp-control = dontCheck super.ntp-control;
pkgs/games/hedgewars/default.nix+11−1
@@ -6,8 +6,9 @@
66}:
77
88let
9+ # gameServer/hedgewars-server.cabal depends on network < 3
910 ghc = ghcWithPackages (pkgs: with pkgs; [
10− SHA bytestring entropy hslogger network pkgs.zlib random
11+ SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random
1112 regex-tdfa sandi utf8-string vector
1213 ]);
1314
@@ -40,6 +41,15 @@ mkDerivation rec {
4041 "-DNOSERVER=${if withServer then "OFF" else "ON"}"
4142 ];
4243
44+
45+ # hslogger brings network-3 and network-bsd which conflict with
46+ # network-2.6.3.1
47+ preConfigure = ''
48+ substituteInPlace gameServer/CMakeLists.txt \
49+ --replace "haskell_flags}" \
50+ "haskell_flags} -package network-2.6.3.1 -hide-package network-bsd"
51+ '';
52+
4353 NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [
4454 SDL2.out
4555 SDL2_image