From 67120e231d8609e71879c0b6d132c1f1ccaecfa7 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sat, 23 Sep 2017 23:08:09 +0200 Subject: [PATCH] slock: adds ability to add custom patches --- pkgs/misc/screensavers/slock/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 55765a520da..6b310236de4 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=\${out} PREFIX="; - patchPhase = "sed -i '/chmod u+s/d' Makefile"; + postPatch = "sed -i '/chmod u+s/d' Makefile"; preBuild = optionalString (conf != null) '' cp ${writeText "config.def.h" conf} config.def.h diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5418ddc002f..14a26066420 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19065,7 +19065,9 @@ with pkgs; seafile-shared = callPackage ../misc/seafile-shared { }; - slock = callPackage ../misc/screensavers/slock { }; + slock = callPackage ../misc/screensavers/slock { + conf = config.slock.conf or null; + }; smokeping = callPackage ../tools/networking/smokeping { inherit fping rrdtool;