alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #195536 from 360ied/classicube-1.3.3

Browse source 
classicube: 1.3.2 -> 1.3.3
This commit is contained in:
Jonas Heinrich 2022-10-12 09:57:14 +02:00 committed by GitHub
parent 2e9fa7f528 3f525e0de4
commit fc0c0a17ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/games/classicube/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ClassiCube"; pname = "ClassiCube";
version = "1.3.2"; version = "1.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "UnknownShadow200"; owner = "UnknownShadow200";
repo = "ClassiCube"; repo = "ClassiCube";
rev = version; rev = version;
sha256 = "6a0f7b03ef3a7f74cf42ffa5b88ab1a7b7beb4d864871a1b700465343ae74bb6"; sha256 = "a31e95a7f49e58aaf4271015dd60730fc74d9776dfac425a8f14eb64cdcd9944";
}; };
nativeBuildInputs = [ dos2unix makeWrapper ]; nativeBuildInputs = [ dos2unix makeWrapper ];
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
# in ~/.local/share instead. # in ~/.local/share instead.
wrapProgram "$out/bin/ClassiCube" \ wrapProgram "$out/bin/ClassiCube" \
--run 'mkdir -p "$HOME/.local/share/ClassiCube"' \ --run 'mkdir -p "$HOME/.local/share/ClassiCube"' \
--add-flags '-d"$HOME/.local/share/ClassiCube"' --run 'cd "$HOME/.local/share/ClassiCube"'
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/games/classicube/font-location.patch
View file

@ -6,10 +6,10 @@ index bca992d..3540afa 100644
String_FromConst("/Library/Fonts") String_FromConst("/Library/Fonts")
}; };
#else #else
- static const cc_string dirs[2] = { - static const cc_string dirs[] = {
- String_FromConst("/usr/share/fonts"), - String_FromConst("/usr/share/fonts"),
- String_FromConst("/usr/local/share/fonts") - String_FromConst("/usr/local/share/fonts")
+ static const cc_string dirs[1] = { + static const cc_string dirs[] = {
+ String_FromConst("%NIXPKGS_FONT_PATH%") + String_FromConst("%NIXPKGS_FONT_PATH%")
}; };
#endif #endif