tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
pokerth, pokerth-server: unpin boost16x
Weijia Wang
2 years ago
a3deb65c
c9c6853c
+19
-19
2 changed files
expand all
collapse all
unified
split
pkgs
games
pokerth
default.nix
top-level
all-packages.nix
+18
-15
pkgs/games/pokerth/default.nix
···
1
1
-
{ lib, mkDerivation, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
1
1
+
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, qtbase
2
2
, SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite
3
3
, wrapQtAppsHook
4
4
, tinyxml2, target ? "client" }:
5
5
6
6
-
let
7
7
-
hiDPI = fetchpatch {
8
8
-
url = "https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch";
9
9
-
sha256 = "192x3lqvd1fanasb95shdygn997qfrpk1k62k1f4j3s5chkwvjig";
10
10
-
};
11
11
-
12
12
-
revertPatch = patch: runCommand "revert-${patch.name}" {} ''
13
13
-
${patchutils}/bin/interdiff ${patch} /dev/null > $out
14
14
-
'';
15
15
-
in
16
16
-
17
6
mkDerivation rec {
18
7
pname = "pokerth-${target}";
19
8
version = "1.1.2";
···
21
10
src = fetchFromGitHub {
22
11
owner = "pokerth";
23
12
repo = "pokerth";
24
24
-
rev = "f5688e01b0efb37035e3b0e3a432200185b9a0c5";
25
25
-
sha256 = "0la8d036pbscjnbxf8lkrqjfq8a4ywsfwxil452fhlays6mr19h0";
13
13
+
rev = "v${version}";
14
14
+
hash = "sha256-j4E3VMpaPqX7+hE3wYRZZUeRD//F+K2Gp8oPmJqX5FQ=";
26
15
};
27
16
28
17
patches = [
29
29
-
(revertPatch hiDPI)
18
18
+
(fetchpatch {
19
19
+
name = "pokerth-1.1.2.patch";
20
20
+
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
21
21
+
hash = "sha256-we2UOCFF5J/Wlji/rJeCHDu/dNsUU+R+bTw83AmvDxs=";
22
22
+
})
23
23
+
(fetchpatch {
24
24
+
name = "pokerth-1.1.2.patch.2019";
25
25
+
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch.2019?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
26
26
+
hash = "sha256-m6uFPmPC3T9kV7EI1p33vQSi0d/w+YCH0dKjviAphMY=";
27
27
+
})
28
28
+
(fetchpatch {
29
29
+
name = "pokerth-1.1.2.patch.2020";
30
30
+
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch.2020?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
31
31
+
hash = "sha256-I2qrgLGSMvFDHyUZFWGPGnuecZ914NBf2uGK02X/wOg=";
32
32
+
})
30
33
];
31
34
32
35
postPatch = ''
+1
-4
pkgs/top-level/all-packages.nix
···
37006
37006
37007
37007
pong3d = callPackage ../games/pong3d { };
37008
37008
37009
37009
-
pokerth = libsForQt5.callPackage ../games/pokerth {
37010
37010
-
boost = boost16x;
37011
37011
-
};
37009
37009
+
pokerth = libsForQt5.callPackage ../games/pokerth { };
37012
37010
37013
37011
pokerth-server = libsForQt5.callPackage ../games/pokerth {
37014
37014
-
boost = boost16x;
37015
37012
target = "server";
37016
37013
};
37017
37014