ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

cataclysm-dda{,-git}: fix share directory

Browse Source 
Data should be in PREFIX/share/cataclysm-dda instead of PREFIX/share.
This commit is contained in:
Mitsuhiro Nakamura 2018-01-22 17:26:52 +09:00
parent beb70f1370
commit fc06a987a0
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/games/cataclysm-dda/default.nix
View File

@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
sed -i Makefile \ sed -i Makefile \
-e 's,-Werror,,g' \ -e 's,-Werror,,g'
-e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g'
sed '1i#include <cmath>' \ sed '1i#include <cmath>' \
-i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp
@ -44,7 +43,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/cataclysm-tiles \ wrapProgram $out/bin/cataclysm-tiles \
--add-flags "--datadir $out/share/" --add-flags "--datadir $out/share/cataclysm-dda/"
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString 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

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

@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
sed -i Makefile \ sed -i Makefile \
-e 's,-Werror,,g' \ -e 's,-Werror,,g'
-e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g'
sed '1i#include <cmath>' \ sed '1i#include <cmath>' \
-i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp