tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
classicube: 1.3.5 -> 1.3.6
360ied
2 years ago
cd856f1f
a158dd2e
+7
-11
2 changed files
expand all
collapse all
unified
split
pkgs
games
classicube
default.nix
fix-linking.patch
+4
-8
pkgs/games/classicube/default.nix
···
15
15
16
16
stdenv.mkDerivation rec {
17
17
pname = "ClassiCube";
18
18
-
version = "1.3.5";
18
18
+
version = "1.3.6";
19
19
20
20
src = fetchFromGitHub {
21
21
owner = "UnknownShadow200";
22
22
repo = "ClassiCube";
23
23
rev = version;
24
24
-
sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig=";
24
24
+
sha256 = "sha256-7VPn5YXNoAR3ftYMDQuQRqeMCrbyB56ir1sQWBiPWAI=";
25
25
};
26
26
27
27
nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ];
···
64
64
--replace '%NIXPKGS_FONT_PATH%' "${font_path}"
65
65
# ClassiCube's Makefile hardcodes JOBS=1 for some reason,
66
66
# even though it works perfectly well multi-threaded.
67
67
-
substituteInPlace src/Makefile \
67
67
+
substituteInPlace Makefile \
68
68
--replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES"
69
69
'';
70
70
71
71
buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ];
72
72
73
73
-
preBuild = "cd src";
74
74
-
75
75
-
postBuild = "cd -";
76
76
-
77
73
installPhase = ''
78
74
runHook preInstall
79
75
80
76
mkdir -p "$out/bin"
81
81
-
cp 'src/ClassiCube' "$out/bin"
77
77
+
cp 'ClassiCube' "$out/bin"
82
78
# ClassiCube puts downloaded resources
83
79
# next to the location of the executable by default.
84
80
# This doesn't work with Nix
+3
-3
pkgs/games/classicube/fix-linking.patch
···
1
1
-
diff --git a/src/Makefile b/src/Makefile
1
1
+
diff --git a/Makefile b/Makefile
2
2
index 83188ce..3439cdb 100644
3
3
-
--- a/src/Makefile
4
4
-
+++ b/src/Makefile
3
3
+
--- a/Makefile
4
4
+
+++ b/Makefile
5
5
@@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9
6
6
endif
7
7