b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #236225 from wegank/pokerth-boost

Browse source 
pokerth, pokerth-server: unpin boost16x
This commit is contained in:
Weijia Wang 2023-06-06 12:58:50 +03:00 committed by GitHub
parent dc9f93b54b a3deb65c59
commit 96a6ceb3d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/games/pokerth/default.nix
View file

@ -1,19 +1,8 @@
{ lib, mkDerivation, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, qtbase
, SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite
, wrapQtAppsHook
, tinyxml2, target ? "client" }:
let
hiDPI = fetchpatch {
url = "https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch";
sha256 = "192x3lqvd1fanasb95shdygn997qfrpk1k62k1f4j3s5chkwvjig";
};
revertPatch = patch: runCommand "revert-${patch.name}" {} ''
${patchutils}/bin/interdiff ${patch} /dev/null > $out
'';
in
mkDerivation rec {
pname = "pokerth-${target}";
version = "1.1.2";
@ -21,12 +10,26 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "pokerth";
repo = "pokerth";
rev = "f5688e01b0efb37035e3b0e3a432200185b9a0c5";
sha256 = "0la8d036pbscjnbxf8lkrqjfq8a4ywsfwxil452fhlays6mr19h0";
rev = "v${version}";
hash = "sha256-j4E3VMpaPqX7+hE3wYRZZUeRD//F+K2Gp8oPmJqX5FQ=";
};
patches = [
(revertPatch hiDPI)
(fetchpatch {
name = "pokerth-1.1.2.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
hash = "sha256-we2UOCFF5J/Wlji/rJeCHDu/dNsUU+R+bTw83AmvDxs=";
})
(fetchpatch {
name = "pokerth-1.1.2.patch.2019";
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch.2019?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
hash = "sha256-m6uFPmPC3T9kV7EI1p33vQSi0d/w+YCH0dKjviAphMY=";
})
(fetchpatch {
name = "pokerth-1.1.2.patch.2020";
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch.2020?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
hash = "sha256-I2qrgLGSMvFDHyUZFWGPGnuecZ914NBf2uGK02X/wOg=";
})
];
postPatch = ''

5
pkgs/top-level/all-packages.nix
View file

@ -37014,12 +37014,9 @@ with pkgs;
pong3d = callPackage ../games/pong3d { };
pokerth = libsForQt5.callPackage ../games/pokerth {
boost = boost16x;
};
pokerth = libsForQt5.callPackage ../games/pokerth { };
pokerth-server = libsForQt5.callPackage ../games/pokerth {
boost = boost16x;
target = "server";
};