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

Merge pull request #87050 from rardiol/hedgewars

Browse Source 
Hedgewars server fix haskell
This commit is contained in:
Peter Simons 2020-05-08 21:03:56 +02:00 committed by GitHub
commit 01a1423ddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -333,6 +333,7 @@ self: super: {
nats-queue = dontCheck super.nats-queue; nats-queue = dontCheck super.nats-queue;
netpbm = dontCheck super.netpbm; netpbm = dontCheck super.netpbm;
network = dontCheck super.network; network = dontCheck super.network;
network_2_6_3_1 = dontCheck super.network_2_6_3_1;
network-dbus = dontCheck super.network-dbus; network-dbus = dontCheck super.network-dbus;
notcpp = dontCheck super.notcpp; notcpp = dontCheck super.notcpp;
ntp-control = dontCheck super.ntp-control; ntp-control = dontCheck super.ntp-control;

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

@ -6,8 +6,9 @@
}: }:
let let
# gameServer/hedgewars-server.cabal depends on network < 3
ghc = ghcWithPackages (pkgs: with pkgs; [ ghc = ghcWithPackages (pkgs: with pkgs; [
SHA bytestring entropy hslogger network pkgs.zlib random SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random
regex-tdfa sandi utf8-string vector regex-tdfa sandi utf8-string vector
]); ]);
@ -40,6 +41,15 @@ mkDerivation rec {
"-DNOSERVER=${if withServer then "OFF" else "ON"}" "-DNOSERVER=${if withServer then "OFF" else "ON"}"
]; ];
# hslogger brings network-3 and network-bsd which conflict with
# network-2.6.3.1
preConfigure = ''
substituteInPlace gameServer/CMakeLists.txt \
--replace "haskell_flags}" \
"haskell_flags} -package network-2.6.3.1 -hide-package network-bsd"
'';
NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [
SDL2.out SDL2.out
SDL2_image SDL2_image