diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-24 20:15:59 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-24 20:18:52 +0000 |
| commit | cc69ea38a55e0b032b1c2059ab6af9baf8ed5293 (patch) | |
| tree | d76e5682e92bda40fd4688b3157b77689a195e65 /pkgs | |
| parent | c4ba389a9faad46fe24b0969bf26fff1d29e7e8e (diff) | |
| download | nixpkgs-cc69ea38a55e0b032b1c2059ab6af9baf8ed5293.tar nixpkgs-cc69ea38a55e0b032b1c2059ab6af9baf8ed5293.tar.gz nixpkgs-cc69ea38a55e0b032b1c2059ab6af9baf8ed5293.tar.bz2 nixpkgs-cc69ea38a55e0b032b1c2059ab6af9baf8ed5293.tar.lz nixpkgs-cc69ea38a55e0b032b1c2059ab6af9baf8ed5293.tar.xz nixpkgs-cc69ea38a55e0b032b1c2059ab6af9baf8ed5293.tar.zst nixpkgs-cc69ea38a55e0b032b1c2059ab6af9baf8ed5293.zip | |
Revert "crawl: fix build with multiple outputs"
This reverts commit 5d51614620e5a891a185f155462106712ac922cc. Fixed on master already
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/crawl/crawl_purify.patch | 2 | ||||
| -rw-r--r-- | pkgs/games/crawl/default.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index eaff3d74b98..bae82bebfb7 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -7,7 +7,7 @@ index b7e2fbf..5ff23db 100644 ifndef CROSSHOST - SQLITE_INCLUDE_DIR := /usr/include -+ SQLITE_INCLUDE_DIR := @sqliteDev@/include ++ SQLITE_INCLUDE_DIR := ${sqlite.dev}/include else # This is totally wrong, works only with some old-style setups, and # on some architectures of Debian/new FHS multiarch -- excluding, for diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 18eb50b2815..edaa3ef1fcc 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -30,12 +30,10 @@ stdenv.mkDerivation rec { patchShebangs $i done patchShebangs util/gen-mi-enum - substituteInPlace Makefile \ - --subst-var-by sqliteDev ${sqlite.dev} ''; makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" - "SAVEDIR=~/.crawl" ] + "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else ""; |