about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-11-11 03:11:09 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-11-11 03:11:09 +0000
commite6cbed31eef6c59610eb0b4b0d4cdee2ed35f97e (patch)
tree50e9ec65882286c42f2d5c8a9399817946e4a9db /pkgs
parent718a4ec1c597dc464a91426a6651fdac71d8df42 (diff)
* Hard-code the path to xdpyinfo rather than expecting it to be in
  $PATH.  This is necessary because x11vnc does a "su - <user>
  ... xdpyinfo" somewhere.

svn path=/nixpkgs/trunk/; revision=30387
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/X11/x11vnc/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 909c12e9f60a1..71c7046b0b7ac 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
     substituteInPlace x11vnc/unixpw.c \
         --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \
         --replace '"/bin/true"' '"${coreutils}/bin/true"'
+        
+    substituteInPlace x11vnc/ssltools.h \
+        --replace xdpyinfo ${xorg.xdpyinfo}/bin/xdpyinfo
   '';
 
   meta = {