Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'

1 files changed, 22 insertions, 19 deletions

diff --git a/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix b/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix
index 257b943c9e76..0da198aab789 100644
--- a/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix
@@ -1,31 +1,34 @@
-{ stdenv, fetchurl, xlibsWrapper
-, imake, gccmakedep, libXScrnSaver, xorgproto }:
+{ stdenv, fetchFromGitHub, xlibsWrapper
+, imake, gccmakedep, libXScrnSaver, xorgproto
+}:
 
 stdenv.mkDerivation rec {
-  name = "xautolock-2.2";
-  src = fetchurl {
-    url = "https://www.ibiblio.org/pub/Linux/X11/screensavers/${name}.tgz";
-    sha256 = "11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2";
+  name = "xautolock-${version}";
+  version = "2.2-7-ga23dd5c";
+
+  # This repository contains xautolock-2.2 plus various useful patches that
+  # were collected from Debian, etc.
+  src = fetchFromGitHub {
+    owner = "peti";
+    repo = "xautolock";
+    rev = "v${version}";
+    sha256 = "10j61rl0sx9sh84rjyfyddl73xb5i2cpb17fyrli8kwj39nw0v2g";
   };
-  patches = [
-    # https://gist.github.com/miekg/9430422
-    (fetchurl {
-      url = "https://gist.githubusercontent.com/miekg/9430422/raw/f00965cd63c497d320f028a9972d1185b0dae039/14-add-lockaftersleep-patch";
-      sha256 = "042lc5yyyl3zszll2l930apysd0lip26w0d0f0gjkl7sbhshgk8v";
-    })
-  ];
-  NIX_CFLAGS_COMPILE = "-DSYSV";
+
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ];
+
   makeFlags = [
     "BINDIR=$(out)/bin"
     "MANPATH=$(out)/share/man"
   ];
+
   installTargets = "install install.man";
-  nativeBuildInputs = [ imake gccmakedep ];
-  buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ];
+
   meta = with stdenv.lib; {
-    description = "A program that launches a given program when your X session has been idle for a given time.";
-    homepage = http://www.ibiblio.org/pub/linux/X11/screensavers;
-    maintainers = with maintainers; [ garbas ];
+    description = "Launch a given program when your X session has been idle for a given time.";
+    homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers";
+    maintainers = with maintainers; [ garbas peti ];
     platforms = platforms.linux;
     license = licenses.gpl2;
   };