Merge branch 'master' of prism.r:stockholm

2 files changed, 13 insertions, 4 deletions

diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index 89b95ca07..5b369362e 100644
--- a/krebs/5pkgs/haskell/flameshot-once.nix
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -4,11 +4,11 @@
 }:
 mkDerivation {
   pname = "flameshot-once";
-  version = "1.1.0";
+  version = "1.2.0";
   src = fetchgit {
     url = "https://cgit.krebsco.de/flameshot-once";
-    sha256 = "158ha1yyj3p3mdjjga62j91ml83nhrsg34xbg3dir5cb399j8pxx";
-    rev = "9d688b6ffad14912bd1afe42555747cb3d213d95";
+    sha256 = "01c11dk8ss37awfn9xqsgx668dcrf4kvzfxlq7ycnqsnpbjjvm0a";
+    rev = "cebaefa37095e74ad2253c4e2f9d9ab390f88737";
     fetchSubmodules = true;
   };
   isLibrary = false;
diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix
index 7373da00a..8ea8a850c 100644
--- a/krebs/5pkgs/simple/flameshot-once/profile.nix
+++ b/krebs/5pkgs/simple/flameshot-once/profile.nix
@@ -29,7 +29,7 @@ let
 
   eval = evalModules {
     modules = singleton {
-      _file = toString ./config.nix;
+      _file = toString ./profile.nix;
       imports = singleton config;
       options = {
         buttons = mkOption {
@@ -77,6 +77,14 @@ let
           default = false;
           type = types.bool;
         };
+        timeout = mkOption {
+          default = 100;
+          description = ''
+            Maximum time in milliseconds allowed for the flameshot daemon to
+            react.
+          '';
+          type = types.positive;
+        };
       };
     };
   };
@@ -125,5 +133,6 @@ in
 
   pkgs.writeDash "flameshot.profile" ''
     export FLAMESHOT_CAPTURE_PATH=${cfg.savePath}
+    export FLAMESHOT_ONCE_TIMEOUT=${toString cfg.timeout}
     export XDG_CONFIG_HOME=${XDG_CONFIG_HOME}
   ''