Merge pull request #190983 from McSinyx/hedgewars-rolling

authored by Franz Pletz and committed by GitHub 474faf3a 381106b6

+3 -40
+3 -30
pkgs/games/hedgewars/default.nix
··· 7 }: 8 9 let 10 - # gameServer/hedgewars-server.cabal depends on network < 3 11 ghc = ghcWithPackages (pkgs: with pkgs; [ 12 - SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random 13 regex-tdfa sandi utf8-string vector 14 ]); 15 - 16 in 17 stdenv.mkDerivation rec { 18 pname = "hedgewars"; 19 - version = "1.0.0"; 20 21 src = fetchurl { 22 url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; 23 - sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1"; 24 }; 25 26 nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; ··· 33 qtbase 34 ] ++ lib.optional withServer ghc; 35 36 - patches = [ 37 - ./qt515.patch 38 - ]; 39 - 40 - postPatch = '' 41 - substituteInPlace gameServer/CMakeLists.txt \ 42 - --replace mask evaluate 43 - 44 - # compile with fpc >= 3.2.0 45 - # https://github.com/archlinux/svntogit-community/blob/75a1b3900fb3dd553d5114bbc8474d85fd6abb02/trunk/PKGBUILD#L26 46 - sed -i 's/procedure ShiftWorld(Dir: LongInt); inline;/procedure ShiftWorld(Dir: LongInt);/' hedgewars/uWorld.pas 47 - ''; 48 - 49 cmakeFlags = [ 50 "-DNOVERSIONINFOUPDATE=ON" 51 "-DNOSERVER=${if withServer then "OFF" else "ON"}" 52 ]; 53 - 54 - 55 - # hslogger brings network-3 and network-bsd which conflict with 56 - # network-2.6.3.1 57 - preConfigure = '' 58 - substituteInPlace gameServer/CMakeLists.txt \ 59 - --replace "haskell_flags}" \ 60 - "haskell_flags} -package network-2.6.3.1 -hide-package network-bsd" 61 - ''; 62 63 NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ 64 SDL2.out ··· 107 all movement on the battlefield has ceased).''; 108 maintainers = with maintainers; [ kragniz fpletz ]; 109 inherit (fpc.meta) platforms; 110 - # https://github.com/NixOS/nixpkgs/pull/185755#issuecomment-1219024584 111 - broken = true; 112 - hydraPlatforms = platforms.none; 113 }; 114 }
··· 7 }: 8 9 let 10 ghc = ghcWithPackages (pkgs: with pkgs; [ 11 + SHA bytestring entropy hslogger network pkgs.zlib random 12 regex-tdfa sandi utf8-string vector 13 ]); 14 in 15 stdenv.mkDerivation rec { 16 pname = "hedgewars"; 17 + version = "1.0.2"; 18 19 src = fetchurl { 20 url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; 21 + sha256 = "sha256-IB/l5FvYyls9gbGOwGvWu8n6fCxjvwGQBeL4C+W88hI="; 22 }; 23 24 nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; ··· 31 qtbase 32 ] ++ lib.optional withServer ghc; 33 34 cmakeFlags = [ 35 "-DNOVERSIONINFOUPDATE=ON" 36 "-DNOSERVER=${if withServer then "OFF" else "ON"}" 37 ]; 38 39 NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ 40 SDL2.out ··· 83 all movement on the battlefield has ceased).''; 84 maintainers = with maintainers; [ kragniz fpletz ]; 85 inherit (fpc.meta) platforms; 86 }; 87 }
-10
pkgs/games/hedgewars/qt515.patch
··· 1 - --- a/QTfrontend/ui/page/pagegamestats.cpp 2 - +++ b/QTfrontend/ui/page/pagegamestats.cpp 3 - @@ -22,6 +22,7 @@ 4 - #include <QGraphicsScene> 5 - #include <QGroupBox> 6 - #include <QSizePolicy> 7 - +#include <QPainterPath> 8 - 9 - #include "pagegamestats.h" 10 - #include "team.h"
···