diff options
Diffstat (limited to 'nixpkgs/pkgs/games/crawl/crawl_purify.patch')
-rw-r--r-- | nixpkgs/pkgs/games/crawl/crawl_purify.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/games/crawl/crawl_purify.patch b/nixpkgs/pkgs/games/crawl/crawl_purify.patch new file mode 100644 index 000000000000..8650141744d6 --- /dev/null +++ b/nixpkgs/pkgs/games/crawl/crawl_purify.patch @@ -0,0 +1,33 @@ +diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font +index f8b576fd63..b95c21c0a1 100755 +--- a/crawl-ref/source/util/find_font ++++ b/crawl-ref/source/util/find_font +@@ -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 @@ name=$1 + 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 +diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc +index e29ccff507..9bf01e040a 100644 +--- a/crawl-ref/source/windowmanager-sdl.cc ++++ b/crawl-ref/source/windowmanager-sdl.cc +@@ -20,7 +20,7 @@ + # else + # include <SDL2/SDL.h> + # endif +-# include <SDL_image.h> ++# include <SDL2/SDL_image.h> + # if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS) + # include <SDL2/SDL_mixer.h> + # endif |