diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-06-10 11:00:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-10 11:00:53 +0100 |
| commit | fbe658eea073cb36a7740c2f76f428c6ac792e73 (patch) | |
| tree | bcbadf3aa18eff697231f5b940984ef0f899c5c1 /pkgs/tools | |
| parent | 3f0db2794fa7f002c264a5c449f93af75ffbe1f1 (diff) | |
| parent | 451de09f513aca784837902082729e4cc8eca4ea (diff) | |
| download | nixlib-fbe658eea073cb36a7740c2f76f428c6ac792e73.tar nixlib-fbe658eea073cb36a7740c2f76f428c6ac792e73.tar.gz nixlib-fbe658eea073cb36a7740c2f76f428c6ac792e73.tar.bz2 nixlib-fbe658eea073cb36a7740c2f76f428c6ac792e73.tar.lz nixlib-fbe658eea073cb36a7740c2f76f428c6ac792e73.tar.xz nixlib-fbe658eea073cb36a7740c2f76f428c6ac792e73.tar.zst nixlib-fbe658eea073cb36a7740c2f76f428c6ac792e73.zip | |
Merge pull request #26296 from gnidorah/master3
autorandr: 855c18b -> 1.1
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/autorandr/default.nix | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index d63819ade215..b885b5ed09d5 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,48 +6,41 @@ let python = python3Packages.python; wrapPython = python3Packages.wrapPython; - date = "2017-01-22"; + version = "1.1"; in stdenv.mkDerivation { - name = "autorandr-unstable-${date}"; + name = "autorandr-${version}"; - buildInputs = [ python wrapPython ]; - - phases = [ "unpackPhase" "installPhase" ]; + buildInputs = [ python ]; installPhase = '' + runHook preInstall make install TARGETS='autorandr' PREFIX=$out - wrapPythonProgramsIn $out/bin/autorandr $out make install TARGETS='bash_completion' DESTDIR=$out make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out - ${if false then '' - # breaks systemd-udev-settle during boot so disabled + ${if systemd != null then '' make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ SYSTEMD_UNIT_DIR=/lib/systemd/system \ UDEV_RULES_DIR=/etc/udev/rules.d substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ - --replace /bin "${systemd}/bin" - '' else if systemd != null then '' - make install TARGETS='systemd' PREFIX=$out DESTDIR=$out \ - SYSTEMD_UNIT_DIR=/lib/systemd/system - make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ - UDEV_RULES_DIR=/etc/udev/rules.d + --replace /bin/systemctl "${systemd}/bin/systemctl" '' else '' make install TARGETS='pmutils' DESTDIR=$out \ PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ UDEV_RULES_DIR=/etc/udev/rules.d ''} + runHook postInstall ''; src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; - rev = "855c18b7f2cfd364d6f085d4301b5b98ba6e572a"; - sha256 = "1yp1gns3lwa8796cb7par9czkc9i7paap2fkzf7wj6zqlkgjdvv0"; + rev = "${version}"; + sha256 = "05jlzxlrdyd4j90srr71fv91c2hf32diw40n9rmybgcdvy45kygd"; }; meta = { |