about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-08-04 16:40:11 -0400
committerGitHub <noreply@github.com>2019-08-04 16:40:11 -0400
commitdf58d379ca93dbca94b0e6607fbd3061f9aa5758 (patch)
tree1ec7a7ce2a4c14eb67283bf57f5ecba231cfd8ba
parent4ea4c00ea0fc4aec9d2b61cf3235a77fbbb62b1e (diff)
parentf6ebeb801da4984c886f3377b2e542d4bbe98664 (diff)
downloadnixlib-df58d379ca93dbca94b0e6607fbd3061f9aa5758.tar
nixlib-df58d379ca93dbca94b0e6607fbd3061f9aa5758.tar.gz
nixlib-df58d379ca93dbca94b0e6607fbd3061f9aa5758.tar.bz2
nixlib-df58d379ca93dbca94b0e6607fbd3061f9aa5758.tar.lz
nixlib-df58d379ca93dbca94b0e6607fbd3061f9aa5758.tar.xz
nixlib-df58d379ca93dbca94b0e6607fbd3061f9aa5758.tar.zst
nixlib-df58d379ca93dbca94b0e6607fbd3061f9aa5758.zip
Merge pull request #65494 from virusdave/dnicponski/scratch/add_dcss
crawl: use static config for data files
-rw-r--r--pkgs/games/crawl/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 203afa93b45e..2179c2bff76d 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -49,8 +49,9 @@ stdenv.mkDerivation rec {
 
   fontsPath = lib.optionalString tileMode dejavu_fonts;
 
-  makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
+  makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
                 "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
+                "DATADIR=${placeholder "out"}"
               ] ++ lib.optional tileMode "TILES=y"
                 ++ lib.optional enableSound "SOUND=y";