diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
commit | 4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch) | |
tree | 129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs/games/crawl/default.nix | |
parent | 6b381d4c9bed35caee62265a92986cec189243b2 (diff) | |
parent | 1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff) | |
download | nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.gz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.bz2 nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.lz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.xz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.zst nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/games/crawl/default.nix')
-rw-r--r-- | pkgs/games/crawl/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 430da66c21c..39d98f4f8b5 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.20.1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26"; + sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh"; }; patches = [ ./crawl_purify.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" + makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] ++ lib.optional tileMode "TILES=y"; |