mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile
|
|
--- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
|
|
+++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile 2016-11-23 15:37:15.303077886 +0300
|
|
@@ -285,7 +285,7 @@
|
|
LIBZ := contrib/install/$(ARCH)/lib/libz.a
|
|
|
|
ifndef CROSSHOST
|
|
- SQLITE_INCLUDE_DIR := /usr/include
|
|
+ SQLITE_INCLUDE_DIR := ${sqlite}/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 -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font
|
|
--- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300
|
|
+++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font 2016-11-23 15:39:04.044031141 +0300
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
|
|
-FONTDIRS="/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts"
|
|
+FONTDIRS="${fontsPath}/share/fonts"
|
|
|
|
name=$1
|
|
[ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; }
|
|
@@ -11,6 +11,6 @@
|
|
for dir in $FONTDIRS; do
|
|
[ -d "$dir" ] && echo "$dir"
|
|
done
|
|
- } | xargs -I% find % \( -type f -o -type l \) -iname "$name" -print \
|
|
+ } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \
|
|
| head -n1
|
|
} 2>/dev/null
|