summary refs log tree commit diff
path: root/pkgs/tools/X11/x11vnc
diff options
context:
space:
mode:
authorChristoph Neidahl (OPNA2608) <christoph.neidahl@uni-leipzig.de>2018-10-17 10:09:16 +0200
committerChristoph Neidahl (OPNA2608) <christoph.neidahl@uni-leipzig.de>2018-10-17 10:09:16 +0200
commit0800c3a72208eaf9d2087c72746da46b69b10483 (patch)
treed30f7384ca21f4c3f6aa3d81238be55ba980cdd6 /pkgs/tools/X11/x11vnc
parent09504f62a72ea38435a3cb1217c8cd12a695a79d (diff)
downloadnixpkgs-0800c3a72208eaf9d2087c72746da46b69b10483.tar
nixpkgs-0800c3a72208eaf9d2087c72746da46b69b10483.tar.gz
nixpkgs-0800c3a72208eaf9d2087c72746da46b69b10483.tar.bz2
nixpkgs-0800c3a72208eaf9d2087c72746da46b69b10483.tar.lz
nixpkgs-0800c3a72208eaf9d2087c72746da46b69b10483.tar.xz
nixpkgs-0800c3a72208eaf9d2087c72746da46b69b10483.tar.zst
nixpkgs-0800c3a72208eaf9d2087c72746da46b69b10483.zip
x11vnc: don't build broken Xdummy script
patching the currently broken Xdummy script out of the Makefile.am, else it gets put into bin.
this is not a regression of functionality, as it doesn't appear to be put into bin in the upstream version either.
Diffstat (limited to 'pkgs/tools/X11/x11vnc')
-rw-r--r--pkgs/tools/X11/x11vnc/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 51307f0df09..9e38a2bc888 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
         --replace '"/bin/true"' '"${coreutils}/bin/true"'
 
     sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h
+    sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am
   '';
 
   meta = with stdenv.lib; {