From 8a82798f976b92be03f42ea304e8e55a93239b48 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 9 Jul 2016 22:40:34 +0200 Subject: [PATCH] autorandr: avoid use of `xxd` Use the Python fallback instead of bringing in a dependency on Vim. --- pkgs/tools/misc/autorandr/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 3e922ab9652..46c056ef0c0 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -2,6 +2,7 @@ , stdenv , enableXRandr ? true, xrandr ? null , enableDisper ? true, disper ? null +, python , xdpyinfo }: assert enableXRandr -> xrandr != null; @@ -27,7 +28,9 @@ in substituteInPlace "autorandr" \ --replace "/usr/bin/xrandr" "${if enableXRandr then xrandr else "/nowhere"}/bin/xrandr" \ --replace "/usr/bin/disper" "${if enableDisper then disper else "/nowhere"}/bin/disper" \ - --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo" + --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo" \ + --replace "which xxd" "false" \ + --replace "python" "${python}/bin/python" ''; installPhase = ''