diff options
| author | Christoph Neidahl (OPNA2608) <christoph.neidahl@uni-leipzig.de> | 2018-10-17 20:13:07 +0200 |
|---|---|---|
| committer | Christoph Neidahl (OPNA2608) <christoph.neidahl@uni-leipzig.de> | 2018-10-17 20:13:07 +0200 |
| commit | 07f135c7f55cfb96bd1e49170b98abbbb847da90 (patch) | |
| tree | a8705a76b8dc9f6fa219764268cfa84c732bef45 /pkgs/tools/X11/x11vnc/default.nix | |
| parent | 0800c3a72208eaf9d2087c72746da46b69b10483 (diff) | |
| download | nixpkgs-07f135c7f55cfb96bd1e49170b98abbbb847da90.tar nixpkgs-07f135c7f55cfb96bd1e49170b98abbbb847da90.tar.gz nixpkgs-07f135c7f55cfb96bd1e49170b98abbbb847da90.tar.bz2 nixpkgs-07f135c7f55cfb96bd1e49170b98abbbb847da90.tar.lz nixpkgs-07f135c7f55cfb96bd1e49170b98abbbb847da90.tar.xz nixpkgs-07f135c7f55cfb96bd1e49170b98abbbb847da90.tar.zst nixpkgs-07f135c7f55cfb96bd1e49170b98abbbb847da90.zip | |
x11vnc: moving substitutions, commenting sed line
moved substitutions to postPatch phase and commented on workaround sed line, as requested in the code reviews
Diffstat (limited to 'pkgs/tools/X11/x11vnc/default.nix')
| -rw-r--r-- | pkgs/tools/X11/x11vnc/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 9e38a2bc888..6dc785621b5 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -24,17 +24,21 @@ stdenv.mkDerivation rec { libvncserver ]; - preConfigure = '' - configureFlags="--mandir=$out/share/man" - + postPatch = '' substituteInPlace src/unixpw.c \ --replace '"/bin/su"' '"/run/wrappers/bin/su"' \ --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 + + # Xdummy script is currently broken, so we avoid building it. This removes everything Xdummy-related from the affected Makefile sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am ''; + preConfigure = '' + configureFlags="--mandir=$out/share/man" + ''; + meta = with stdenv.lib; { description = "A VNC server connected to a real X11 screen"; homepage = https://github.com/LibVNC/x11vnc/; |