summary refs log tree commit diff
path: root/pkgs/tools/misc/autorandr
diff options
context:
space:
mode:
authorgnidorah <gnidorah@users.noreply.github.com>2017-06-07 13:23:36 +0300
committergnidorah <gnidorah@users.noreply.github.com>2017-06-07 13:23:36 +0300
commit5c9f0d00c38190e96a00f1eeba13148b69faed7c (patch)
treed94e73a2d84c8c0138a8accc82bcc32eb6b1392f /pkgs/tools/misc/autorandr
parent634f5f0d0f680b820484baa04ff94c23786df97b (diff)
downloadnixpkgs-5c9f0d00c38190e96a00f1eeba13148b69faed7c.tar
nixpkgs-5c9f0d00c38190e96a00f1eeba13148b69faed7c.tar.gz
nixpkgs-5c9f0d00c38190e96a00f1eeba13148b69faed7c.tar.bz2
nixpkgs-5c9f0d00c38190e96a00f1eeba13148b69faed7c.tar.lz
nixpkgs-5c9f0d00c38190e96a00f1eeba13148b69faed7c.tar.xz
nixpkgs-5c9f0d00c38190e96a00f1eeba13148b69faed7c.tar.zst
nixpkgs-5c9f0d00c38190e96a00f1eeba13148b69faed7c.zip
autorandr: 855c18b -> 1.1
Diffstat (limited to 'pkgs/tools/misc/autorandr')
-rw-r--r--pkgs/tools/misc/autorandr/default.nix18
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index d63819ade21..8b0885eee07 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -6,10 +6,10 @@
 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 ];
 
@@ -23,18 +23,12 @@ in
 
       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
@@ -46,8 +40,8 @@ in
     src = fetchFromGitHub {
       owner = "phillipberndt";
       repo = "autorandr";
-      rev = "855c18b7f2cfd364d6f085d4301b5b98ba6e572a";
-      sha256 = "1yp1gns3lwa8796cb7par9czkc9i7paap2fkzf7wj6zqlkgjdvv0";
+      rev = "${version}";
+      sha256 = "05jlzxlrdyd4j90srr71fv91c2hf32diw40n9rmybgcdvy45kygd";
     };
 
     meta = {