public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages 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-23 08:08:09 +09:00
parent beb70f1370
commit fc06a987a0
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/cataclysm-dda/default.nix
+2 -3
View File
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs .
sed -i Makefile \
-e 's,-Werror,,g' \
-e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g'
-e 's,-Werror,,g'
sed '1i#include <cmath>' \
-i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp
@@ -44,7 +43,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/cataclysm-tiles \
--add-flags "--datadir $out/share/"
--add-flags "--datadir $out/share/cataclysm-dda/"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
app=$out/Applications/Cataclysm.app
install -D -m 444 data/osx/Info.plist -t $app/Contents
pkgs/games/cataclysm-dda/git.nix
+1 -2
View File
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs .
sed -i Makefile \
-e 's,-Werror,,g' \
-e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g'
-e 's,-Werror,,g'
sed '1i#include <cmath>' \
-i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp