diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-22 17:28:51 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-22 17:28:51 +0100 |
| commit | d12c9911dfcb336243c9d13b8bc7042be3f3d4b2 (patch) | |
| tree | b689c775feef38ad8c315999e0a761dfa694eb1e /pkgs/tools/misc/autorandr/default.nix | |
| parent | fab12188b855d9ac1f64f486ee38f1cf7d53c8f4 (diff) | |
| parent | 186c76539855a8d1a3e76af0ff95b5de50aa48f8 (diff) | |
| download | nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.gz nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.bz2 nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.lz nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.xz nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.zst nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.zip | |
Merge remote-tracking branch 'origin/master' into nix-2.0
Diffstat (limited to 'pkgs/tools/misc/autorandr/default.nix')
| -rw-r--r-- | pkgs/tools/misc/autorandr/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 405eb29f6bf9..db2e1fc622fa 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -2,19 +2,23 @@ , python3Packages , fetchFromGitHub , systemd -, xrandr -, makeWrapper }: +, xrandr }: let python = python3Packages.python; - wrapPython = python3Packages.wrapPython; - version = "1.1"; + version = "1.4"; in stdenv.mkDerivation { name = "autorandr-${version}"; buildInputs = [ python ]; - nativeBuildInputs = [ makeWrapper ]; + + # no wrapper, as autorandr --batch does os.environ.clear() + buildPhase = '' + substituteInPlace autorandr.py \ + --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ + --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' + ''; installPhase = '' runHook preInstall @@ -40,16 +44,11 @@ in runHook postInstall ''; - postFixup = '' - wrapProgram $out/bin/autorandr \ - --prefix PATH : ${xrandr}/bin - ''; - src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "05jlzxlrdyd4j90srr71fv91c2hf32diw40n9rmybgcdvy45kygd"; + sha256 = "08i71r221ilc8k1c59w89g3iq5m7zwhnjjzapavhqxlr8y9dcpf5"; }; meta = { |