diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-02-22 15:54:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 15:54:43 +0800 |
| commit | 8f80b63696f6bf5be4b2e842cf3081650364caae (patch) | |
| tree | 818c4762ac8803a96f0376d4202a37711908a738 /pkgs | |
| parent | 6e91ce981ca3d7fe32d70041f129372f035a38ef (diff) | |
| parent | e17a222f94852bf2e7ea5b7bb983a72233748cac (diff) | |
| download | nixlib-8f80b63696f6bf5be4b2e842cf3081650364caae.tar nixlib-8f80b63696f6bf5be4b2e842cf3081650364caae.tar.gz nixlib-8f80b63696f6bf5be4b2e842cf3081650364caae.tar.bz2 nixlib-8f80b63696f6bf5be4b2e842cf3081650364caae.tar.lz nixlib-8f80b63696f6bf5be4b2e842cf3081650364caae.tar.xz nixlib-8f80b63696f6bf5be4b2e842cf3081650364caae.tar.zst nixlib-8f80b63696f6bf5be4b2e842cf3081650364caae.zip | |
Merge pull request #35314 from gnidorah/autorandr
autorandr: embed path to xrandr
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/autorandr/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index b744e70a4e2f..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.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,11 +44,6 @@ in runHook postInstall ''; - postFixup = '' - wrapProgram $out/bin/autorandr \ - --prefix PATH : ${xrandr}/bin - ''; - src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; |