From fc06a987a07e602ad9e340b77f54623157f55313 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Mon, 22 Jan 2018 17:26:52 +0900 Subject: cataclysm-dda{,-git}: fix share directory Data should be in PREFIX/share/cataclysm-dda instead of PREFIX/share. --- pkgs/games/cataclysm-dda/default.nix | 5 ++--- pkgs/games/cataclysm-dda/git.nix | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs/games/cataclysm-dda') 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 ' \ -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 ' \ -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp -- cgit 1.4.1