diff options
| author | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-01-22 17:26:52 +0900 |
|---|---|---|
| committer | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-01-23 08:08:09 +0900 |
| commit | fc06a987a07e602ad9e340b77f54623157f55313 (patch) | |
| tree | 1640d36c47705b515f3052379377ce88ba1c98ab /pkgs/games/cataclysm-dda | |
| parent | beb70f1370bd1a35e473ff0cc489e057b5432fd2 (diff) | |
| download | nixpkgs-fc06a987a07e602ad9e340b77f54623157f55313.tar nixpkgs-fc06a987a07e602ad9e340b77f54623157f55313.tar.gz nixpkgs-fc06a987a07e602ad9e340b77f54623157f55313.tar.bz2 nixpkgs-fc06a987a07e602ad9e340b77f54623157f55313.tar.lz nixpkgs-fc06a987a07e602ad9e340b77f54623157f55313.tar.xz nixpkgs-fc06a987a07e602ad9e340b77f54623157f55313.tar.zst nixpkgs-fc06a987a07e602ad9e340b77f54623157f55313.zip | |
cataclysm-dda{,-git}: fix share directory
Data should be in PREFIX/share/cataclysm-dda instead of PREFIX/share.
Diffstat (limited to 'pkgs/games/cataclysm-dda')
| -rw-r--r-- | pkgs/games/cataclysm-dda/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/games/cataclysm-dda/git.nix | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index 550d557e57e..a06b53ac219 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -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 diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 264dc8b65a0..86e040546dc 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -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 |