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

cataclysm-dda{,-git}: styling

Browse source
This commit is contained in:
Mitsuhiro Nakamura 2018-02-07 00:01:15 +09:00
parent 289c8df4e5
commit a2df3ee293
2 changed files with 38 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/games/cataclysm-dda/default.nix
View file

@ -1,5 +1,6 @@
{ fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
SDL2_mixer, freetype, gettext, Cocoa, libicns, tiles ? true }: SDL2_mixer, freetype, gettext, Cocoa, libicns,
tiles ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.C"; version = "0.C";
@ -15,9 +16,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ] nativeBuildInputs = [ pkgconfig ]
++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ libicns ]; ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ libicns ];
buildInputs = [ ncurses lua gettext ] buildInputs = with stdenv.lib; [ ncurses lua gettext ]
++ stdenv.lib.optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] ++ optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ]
++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ Cocoa ]; ++ optionals (tiles && stdenv.isDarwin) [ Cocoa ];
patches = [ ./patches/fix_locale_dir.patch ]; patches = [ ./patches/fix_locale_dir.patch ];
@ -25,18 +26,23 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
''; '';
makeFlags = [ makeFlags = with stdenv.lib; [
"PREFIX=$(out) LUA=1 RELEASE=1 USE_HOME_DIR=1" "PREFIX=$(out)"
"LUA=1"
"RELEASE=1"
"USE_HOME_DIR=1"
# "LANGUAGES=all" # vanilla C:DDA installs all translations even without this flag! # "LANGUAGES=all" # vanilla C:DDA installs all translations even without this flag!
] ++ stdenv.lib.optionals tiles [ ] ++ optionals tiles [
"TILES=1 SOUND=1" "TILES=1"
] ++ stdenv.lib.optionals stdenv.isDarwin [ "SOUND=1"
"NATIVE=osx CLANG=1" ] ++ optionals stdenv.isDarwin [
"NATIVE=osx"
"CLANG=1"
"OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above
] ++ stdenv.lib.optionals stdenv.cc.isGNU [ ] ++ optionals stdenv.cc.isGNU [
"WARNINGS+=-Wno-deprecated-declarations" "WARNINGS+=-Wno-deprecated-declarations"
"WARNINGS+=-Wno-ignored-attributes" "WARNINGS+=-Wno-ignored-attributes"
] ++ stdenv.lib.optionals stdenv.cc.isClang [ ] ++ optionals stdenv.cc.isClang [
"WARNINGS+=-Wno-inconsistent-missing-override" "WARNINGS+=-Wno-inconsistent-missing-override"
]; ];

34
pkgs/games/cataclysm-dda/git.nix
View file

@ -1,5 +1,6 @@
{ fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa, tiles ? true }: SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa,
tiles ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2017-12-09"; version = "2017-12-09";
@ -14,10 +15,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses lua gettext ] buildInputs = with stdenv.lib; [ ncurses lua gettext ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ] ++ optionals stdenv.isDarwin [ CoreFoundation ]
++ stdenv.lib.optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ] ++ optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ]
++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ Cocoa ]; ++ optionals (tiles && stdenv.isDarwin) [ Cocoa ];
patches = [ ./patches/fix_locale_dir_git.patch ]; patches = [ ./patches/fix_locale_dir_git.patch ];
@ -27,20 +28,25 @@ stdenv.mkDerivation rec {
-e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2," -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2,"
''; '';
makeFlags = [ makeFlags = with stdenv.lib; [
"PREFIX=$(out) LUA=1 RELEASE=1 USE_HOME_DIR=1" "PREFIX=$(out)"
"LUA=1"
"RELEASE=1"
"USE_HOME_DIR=1"
"LANGUAGES=all" "LANGUAGES=all"
"VERSION=git-${version}-${stdenv.lib.substring 0 8 src.rev}" "VERSION=git-${version}-${substring 0 8 src.rev}"
] ++ stdenv.lib.optionals tiles [ ] ++ optionals tiles [
"TILES=1 SOUND=1" "TILES=1"
] ++ stdenv.lib.optionals stdenv.isDarwin [ "SOUND=1"
"NATIVE=osx CLANG=1" ] ++ optionals stdenv.isDarwin [
"NATIVE=osx"
"CLANG=1"
]; ];
postInstall = stdenv.lib.optionalString (tiles && !stdenv.isDarwin) '' postInstall = with stdenv.lib; optionalString (tiles && !stdenv.isDarwin) ''
install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T $out/share/applications/cataclysm-dda.desktop install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T $out/share/applications/cataclysm-dda.desktop
install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps
'' + stdenv.lib.optionalString (tiles && stdenv.isDarwin) '' '' + optionalString (tiles && stdenv.isDarwin) ''
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 data/osx/Info.plist -t $app/Contents
install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources