ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #129150 from DeeUnderscore/cataclysm-dda-0.F

Browse Source
This commit is contained in:
Sandro 2021-07-05 20:27:01 +02:00 committed by GitHub
commit 2903a2639f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/games/cataclysm-dda/common.nix
View File

@ -13,17 +13,15 @@ let
tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ] tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ]
++ optionals stdenv.isDarwin [ Cocoa ]; ++ optionals stdenv.isDarwin [ Cocoa ];
installXDGAppLauncher = '' patchDesktopFile = ''
launcher="$out/share/applications/cataclysm-dda.desktop" substituteInPlace $out/share/applications/org.cataclysmdda.CataclysmDDA.desktop \
install -D -m 444 data/xdg/*cataclysm-dda.desktop -T "$launcher" --replace "Exec=cataclysm-tiles" "Exec=$out/bin/cataclysm-tiles"
sed -i "$launcher" -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2,"
install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps
''; '';
installMacOSAppLauncher = '' installMacOSAppLauncher = ''
app=$out/Applications/Cataclysm.app app=$out/Applications/Cataclysm.app
install -D -m 444 data/osx/Info.plist -t $app/Contents install -D -m 444 build-data/osx/Info.plist -t $app/Contents
install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources install -D -m 444 build-data/osx/AppIcon.icns -t $app/Contents/Resources
mkdir $app/Contents/MacOS mkdir $app/Contents/MacOS
launcher=$app/Contents/MacOS/Cataclysm.sh launcher=$app/Contents/MacOS/Cataclysm.sh
cat << EOF > $launcher cat << EOF > $launcher
@ -58,22 +56,19 @@ stdenv.mkDerivation {
] ++ optionals tiles [ ] ++ optionals tiles [
"TILES=1" "SOUND=1" "TILES=1" "SOUND=1"
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"NATIVE=osx" "CLANG=1" "NATIVE=osx"
"CLANG=1"
"OSX_MIN=${stdenv.targetPlatform.darwinMinVersion}"
]; ];
postInstall = optionalString tiles postInstall = optionalString tiles
( if !stdenv.isDarwin ( if !stdenv.isDarwin
then installXDGAppLauncher then patchDesktopFile
else installMacOSAppLauncher else installMacOSAppLauncher
); );
dontStrip = debug; dontStrip = debug;
# https://hydra.nixos.org/build/65193254
# src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory
# make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1
enableParallelBuilding = false;
passthru = { passthru = {
isTiles = tiles; isTiles = tiles;
isCurses = !tiles; isCurses = !tiles;

6
pkgs/games/cataclysm-dda/git.nix
View File

@ -2,9 +2,9 @@
, tiles ? true, Cocoa , tiles ? true, Cocoa
, debug ? false , debug ? false
, useXdgDir ? false , useXdgDir ? false
, version ? "2020-12-09" , version ? "2021-07-03"
, rev ? "cb02195d9fb5ba71f35a105be4104c3d8883065c" , rev ? "9017808252e1e149446c8f8bd7a6582ce0f95285"
, sha256 ? "108cs6vp99qmqqfnmczad0xjgcl82bypm5xszwnlfcswdsrfs4da" , sha256 ? "0qrvkbyg098jb9hv69sg5093b1vj8f4n75p73v01jnmyxlz3ax28"
}: }:
let let

4
pkgs/games/cataclysm-dda/stable.nix
View File

@ -10,13 +10,13 @@ let
}; };
self = common.overrideAttrs (common: rec { self = common.overrideAttrs (common: rec {
version = "0.E-3"; version = "0.F";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CleverRaven"; owner = "CleverRaven";
repo = "Cataclysm-DDA"; repo = "Cataclysm-DDA";
rev = version; rev = version;
sha256 = "qhHtsm5cM0ct/7qXev0SiLInO2jqs2odxhWndLfRDIE="; sha256 = "1jid8lcl04y768b3psj1ifhx96lmd6fn1j2wzxhl4ic7ra66p2z3";
}; };
meta = common.meta // { meta = common.meta // {