pkgs/tools/X11/libstrangle/nixos.patch

   1 diff --git a/makefile b/makefile
   2 --- a/makefile
   3 +++ b/makefile
   4 @@ -86,10 +86,6 @@ install-common:
   5         install -m 0755 -D -T $(SOURCEDIR)/stranglevk.sh $(DESTDIR)$(bindir)/stranglevk
   6         install -m 0644 -D -T $(SOURCEDIR)/vulkan/libstrangle_vk.json $(DESTDIR)$(datarootdir)/vulkan/implicit_layer.d/libstrangle_vk.json
   7
   8 -install-ld: ld
   9 -       install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
  10 -       if [ -z "$(DESTDIR)" ]; then ldconfig; fi
  11 -
  12  install-32: 32-bit
  13         install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
  14         install -m 0755 -D -T $(BUILDDIR)/libstrangle32_nodlsym.so $(DESTDIR)$(LIB32_PATH)/libstrangle_nodlsym.so
  15 @@ -109,8 +105,7 @@ install: \
  16         all \
  17         install-common \
  18         install-32 \
  19 -       install-64 \
  20 -       install-ld
  21 +       install-64
  22
  23  clean:
  24         rm -f $(BUILDDIR)/libstrangle64.so
  25 diff --git a/src/strangle.sh b/src/strangle.sh
  26 --- a/src/strangle.sh
  27 +++ b/src/strangle.sh
  28 @@ -130,6 +130,5 @@ if [ "$STRANGLE_VKONLY" != "1" ]; then
  29         fi
  30  fi
  31
  32 -# Execute the strangled program under a clean environment
  33  # pass through the FPS and overriden LD_PRELOAD environment variables
  34 -exec env ENABLE_VK_LAYER_TORKEL104_libstrangle=1 LD_PRELOAD="${LD_PRELOAD}" "$@"
  35 +ENABLE_VK_LAYER_TORKEL104_libstrangle=1 XDG_DATA_DIRS="${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}@out@/share" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}" exec "$@"
  36 diff --git a/src/stranglevk.sh b/src/stranglevk.sh
  37 --- a/src/stranglevk.sh
  38 +++ b/src/stranglevk.sh
  39 @@ -1,3 +1,3 @@
  40  #!/bin/sh
  41
  42 -ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 strangle "$@"
  43 +ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 @out@/bin/strangle "$@"