public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29108 from Gerschtli/update/slock-patches

Browse Source 
slock: adds ability to add custom patches
This commit is contained in:
Jörg Thalheim 2017-09-24 10:19:31 +01:00 committed by GitHub
commit a75174ae4c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/misc/screensavers/slock/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
installFlags = "DESTDIR=\${out} PREFIX="; installFlags = "DESTDIR=\${out} PREFIX=";
patchPhase = "sed -i '/chmod u+s/d' Makefile"; postPatch = "sed -i '/chmod u+s/d' Makefile";
preBuild = optionalString (conf != null) '' preBuild = optionalString (conf != null) ''
cp ${writeText "config.def.h" conf} config.def.h cp ${writeText "config.def.h" conf} config.def.h

4
pkgs/top-level/all-packages.nix
View File

@ -19104,7 +19104,9 @@ with pkgs;
seafile-shared = callPackage ../misc/seafile-shared { }; 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 { smokeping = callPackage ../tools/networking/smokeping {
inherit fping rrdtool; inherit fping rrdtool;