Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bef8321f9faa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 28264de9fcbf
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 12, 2018

  1. warsow: add missing patch

    @abbradar
    abbradar committed Mar 12, 2018
    Copy the full SHA
    28264de View commit details
Showing with 28 additions and 0 deletions.
  1. +28 −0 pkgs/games/warsow/libpath.patch
28 changes: 28 additions & 0 deletions pkgs/games/warsow/libpath.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff -ru3 warsow_21_sdk_old/source/source/gameshared/q_arch.h warsow_21_sdk_new/source/source/gameshared/q_arch.h
--- warsow_21_sdk_old/source/source/gameshared/q_arch.h 2016-03-26 22:22:10.000000000 +0300
+++ warsow_21_sdk_new/source/source/gameshared/q_arch.h 2018-03-13 00:37:29.907019953 +0300
@@ -206,15 +206,15 @@
#endif

// FIXME: move these to CMakeLists.txt
-#define LIBZ_LIBNAME "libz.so.1|libz.so"
-#define LIBCURL_LIBNAME "libcurl.so.4|libcurl.so.3|libcurl.so"
-#define LIBPNG_LIBNAME "libpng16.so.16|libpng15.so.15|libpng14.so.14|libpng12.so.0|libpng.so"
-#define LIBJPEG_LIBNAME "libjpeg.so.8|libjpeg.so"
-#define LIBOGG_LIBNAME "libogg.so.0|libogg.so"
-#define LIBVORBIS_LIBNAME "libvorbis.so.0|libvorbis.so"
-#define LIBVORBISFILE_LIBNAME "libvorbisfile.so.3|libvorbisfile.so"
-#define LIBTHEORA_LIBNAME "libtheora.so.0|libtheora.so"
-#define LIBFREETYPE_LIBNAME "libfreetype.so.6|libfreetype.so"
+#define LIBZ_LIBNAME "@zlib@/lib/libz.so"
+#define LIBCURL_LIBNAME "@curl@/lib/libcurl.so"
+#define LIBPNG_LIBNAME "@libpng@/lib/libpng.so"
+#define LIBJPEG_LIBNAME "@libjpeg@/lib/libjpeg.so"
+#define LIBOGG_LIBNAME "@libogg@/lib/libogg.so"
+#define LIBVORBIS_LIBNAME "@libvorbis@/lib/libvorbis.so"
+#define LIBVORBISFILE_LIBNAME "@libvorbis@/lib/libvorbisfile.so"
+#define LIBTHEORA_LIBNAME "@libtheora@/lib/libtheora.so"
+#define LIBFREETYPE_LIBNAME "@freetype@/lib/libfreetype.so"

#if defined ( __FreeBSD__ )
#define BUILDSTRING "FreeBSD"