diff options
author | Jonas Hoersch <coroa@online.de> | 2013-09-26 13:12:01 +0200 |
---|---|---|
committer | Jonas Hoersch <coroa@online.de> | 2013-09-26 13:12:01 +0200 |
commit | 683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a (patch) | |
tree | b47a99051cb61cefeac184056f7aaba60b88f741 /pkgs | |
parent | cd902179db236e3d0ad8326cc08b68f786fc7ab2 (diff) | |
download | nixlib-683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a.tar nixlib-683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a.tar.gz nixlib-683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a.tar.bz2 nixlib-683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a.tar.lz nixlib-683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a.tar.xz nixlib-683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a.tar.zst nixlib-683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a.zip |
autorandr: make the dependencies on xrandr and disper configurable by enableX params
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/misc/autorandr/default.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 5146be248da0..d9a727e8a09d 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -1,4 +1,11 @@ -{ fetchgit, stdenv, disper ? null, xrandr, xdpyinfo }: +{ fetchgit +, stdenv +, enableXRandr ? true, xrandr ? null +, enableDisper ? false, disper ? null +, xdpyinfo }: + +assert enableXRandr -> xrandr != null; +assert enableDisper -> disper != null; let rev = "4f5e2401ef"; @@ -13,11 +20,9 @@ in patchPhase = '' substituteInPlace "autorandr" \ - --replace "/usr/bin/xrandr" "${xrandr}/bin/xrandr" \ + --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" - '' + stdenv.lib.optionalString (disper != null) '' - substituteInPlace "autorandr" - --replace "/usr/bin/disper" "${disper}/bin/disper" ''; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c9b84581796..b045f2124035 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -497,7 +497,6 @@ let autorandr = callPackage ../tools/misc/autorandr { inherit (xorg) xrandr xdpyinfo; - disper = null; }; avahi = callPackage ../development/libraries/avahi { |