diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:44:06 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:44:06 +0200 |
commit | 4ca8e53e1ddb2f2f1e5520be33654c33481faae0 (patch) | |
tree | 94896f54f338cc97a1e43adf3dcbdff15d5a512c /pkgs/games/crawl/crawl_purify.patch | |
parent | 59ac7e16347e2e841e24d3dd959b9fc5dab5fdc8 (diff) | |
parent | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (diff) | |
download | nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.gz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.bz2 nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.lz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.xz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.zst nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/games/crawl/crawl_purify.patch')
-rw-r--r-- | pkgs/games/crawl/crawl_purify.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index 67a883c16b0..f792dc013f0 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -1,6 +1,19 @@ diff -ru3 crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile --- crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 +++ crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300 +@@ -224,9 +224,9 @@ + STRIP := strip -x + NEED_APPKIT = YesPlease + LIBNCURSES_IS_UNICODE = Yes +- NO_PKGCONFIG = Yes +- BUILD_SQLITE = YesPlease +- BUILD_ZLIB = YesPlease ++ #NO_PKGCONFIG = Yes ++ #BUILD_SQLITE = YesPlease ++ #BUILD_ZLIB = YesPlease + ifdef TILES + EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -framework AudioToolbox -framework CoreVideo contrib/install/$(ARCH)/lib/libSDL2main.a + BUILD_FREETYPE = YesPlease @@ -286,13 +286,7 @@ LIBZ := contrib/install/$(ARCH)/lib/libz.a |