diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-24 10:19:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-24 10:19:31 +0100 |
| commit | a75174ae4cec8e264a28a758d654ab22c25ac24e (patch) | |
| tree | 4bb8aa05a088e42fcbb76bb7123f6fc5c3ae070d | |
| parent | 105001deacbe294e264dfffce89453ec306aaabd (diff) | |
| parent | 67120e231d8609e71879c0b6d132c1f1ccaecfa7 (diff) | |
| download | nixlib-a75174ae4cec8e264a28a758d654ab22c25ac24e.tar nixlib-a75174ae4cec8e264a28a758d654ab22c25ac24e.tar.gz nixlib-a75174ae4cec8e264a28a758d654ab22c25ac24e.tar.bz2 nixlib-a75174ae4cec8e264a28a758d654ab22c25ac24e.tar.lz nixlib-a75174ae4cec8e264a28a758d654ab22c25ac24e.tar.xz nixlib-a75174ae4cec8e264a28a758d654ab22c25ac24e.tar.zst nixlib-a75174ae4cec8e264a28a758d654ab22c25ac24e.zip | |
Merge pull request #29108 from Gerschtli/update/slock-patches
slock: adds ability to add custom patches
| -rw-r--r-- | pkgs/misc/screensavers/slock/default.nix | 2 | ||||
| -rw-r--r-- | 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 55765a520da2..6b310236de42 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 4df368a51edf..2b05d1d345c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19104,7 +19104,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; |