diff options
| author | Tobias Happ <tobias.happ@gmx.de> | 2017-09-23 23:08:09 +0200 |
|---|---|---|
| committer | Tobias Happ <tobias.happ@gmx.de> | 2017-09-23 23:08:09 +0200 |
| commit | 67120e231d8609e71879c0b6d132c1f1ccaecfa7 (patch) | |
| tree | f96a4c54380131a58415fbe477b92a27a225c9df | |
| parent | 11a4e90fbe257413b40162e6656359f6a1c887bd (diff) | |
| download | nixlib-67120e231d8609e71879c0b6d132c1f1ccaecfa7.tar nixlib-67120e231d8609e71879c0b6d132c1f1ccaecfa7.tar.gz nixlib-67120e231d8609e71879c0b6d132c1f1ccaecfa7.tar.bz2 nixlib-67120e231d8609e71879c0b6d132c1f1ccaecfa7.tar.lz nixlib-67120e231d8609e71879c0b6d132c1f1ccaecfa7.tar.xz nixlib-67120e231d8609e71879c0b6d132c1f1ccaecfa7.tar.zst nixlib-67120e231d8609e71879c0b6d132c1f1ccaecfa7.zip | |
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 5418ddc002f8..14a260664201 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; |