diff options
author | Peter Simons <simons@cryp.to> | 2019-05-08 18:21:27 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2019-05-08 18:21:53 +0200 |
commit | 12731923da9c536c97018672897d2904bbb8b194 (patch) | |
tree | f31f70b5134483900027bb38e92ddce7ba27ba56 /pkgs/misc/screensavers | |
parent | 666ffe5ba301f0bc7faa7031b4dc4ff6516d18e3 (diff) |
xautolock: apply patches from Debian
Diffstat (limited to 'pkgs/misc/screensavers')
-rw-r--r-- | pkgs/misc/screensavers/xautolock/default.nix | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 257b943c9e76..8edb618b3891 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/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-6-ge68d0ed"; + + # 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 = "1131ki6zwk94s8j6zqywf8r5kanx3nrjm692rxh8pcz4hv9qp1mz"; }; - 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; }; |