realwallpaper: introduce marker_file

This commit is contained in:
lassulus 2017-04-15 17:13:40 +02:00
parent 48d37be5de
commit a80cbaa6e9
2 changed files with 6 additions and 10 deletions

View File

@ -32,9 +32,9 @@ let
default = "http://xplanetclouds.com/free/local/clouds_2048.jpg";
};
outFile = mkOption {
marker = mkOption {
type = types.str;
default = "/tmp/wallpaper.png";
default = "http://graphs.r/marker.json";
};
timerConfig = mkOption {
@ -43,7 +43,6 @@ let
OnCalendar = "*:0/15";
};
};
};
imp = {
@ -63,6 +62,7 @@ let
imagemagick
curl
file
jq
];
environment = {
@ -70,7 +70,7 @@ let
nightmap_url = cfg.nightmap;
daymap_url = cfg.daymap;
cloudmap_url = cfg.cloudmap;
out_file = cfg.outFile;
marker_url = cfg.marker;
};
restartIfChanged = true;

View File

@ -5,8 +5,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = https://github.com/Lassulus/realwallpaper;
rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5";
sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs";
rev = "b8408cfb295b6ce5b965309b30358ca6c6409efd";
sha256 = "0yyl8hhqshw9bx04xs8glvir3c0qzvfrwzmbvyg318mnz5xalcl0";
};
phases = [
@ -15,10 +15,6 @@ stdenv.mkDerivation {
];
buildInputs = [
xplanet
imagemagick
curl
file
];
installPhase = ''