Merge branch 'master' of git:nixos

2 files changed, 30 insertions, 6 deletions

diff --git a/patches/yesod-bin.patch b/patches/yesod-bin.patch
new file mode 100644
index 00000000..ac0fe42a
--- /dev/null
+++ b/patches/yesod-bin.patch
@@ -0,0 +1,13 @@
+diff --git a/Devel.hs b/Devel.hs
+index 4289317..c951e37 100644
+--- a/Devel.hs
++++ b/Devel.hs
+@@ -144,7 +144,7 @@ reverseProxy opts appPortVar = do
+                     appPort <- atomically $ readTVar appPortVar
+                     return $
+                         ReverseProxy.WPRProxyDest
+-                        $ ProxyDest "127.0.0.1" appPort)
++                        $ ProxyDest "::1" appPort)
+                 def
+                     { wpsOnExc = \e req f -> onExc e req >>= f
+                     , wpsTimeout =
diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix
index 13607a9f..8dd563d7 100644
--- a/users/gkleen@hel.nix
+++ b/users/gkleen@hel.nix
@@ -1,5 +1,11 @@
 {
   packageOverrides = pkgs: with pkgs; {
+    zathura = lib.overrideDerivation zathura (oldAttrs: {
+      postInstall = ''
+        warpProgram $out/bin/zathura \
+          --set GDK_SCALE 1
+      '';
+    });
     chromium-wrapper = symlinkJoin {
       name = ''${chromium.name}-wrapped'';
       paths = [ chromium ];
@@ -32,30 +38,35 @@
 
       export PATH=${psmisc}/bin:$PATH
 
+      trap "killall -s USR2 -u $(whoami) -- dunst" EXIT
+
       killall -s USR1 -u "$(whoami)" -- dunst
       $@
-      killall -s USR2 -u "$(whoami)" -- dunst
     '';
     gajim = lib.overrideDerivation gajim (old: {
       enableNotifications = true;
-      extraPythonPackages = (p: [ p.pygments ]);
     });
     haskellPackages = haskellPackages.override {
       overrides = self: super: with super; {
         extended-reals = haskell.lib.doJailbreak extended-reals;
         pandoc-crossref = haskell.lib.dontTest pandoc-crossref;
+        yesod-bin = haskell.lib.appendPatch yesod-bin ../patches/yesod-bin.patch;
       } // (import ../custom/thermoprint { inherit pkgs; });
     };
+    firefox-unwrapped = firefox-unwrapped.override {
+      enableOfficialBranding = true;
+    };
+    mpv = mpv.override {
+      vaapiSupport = true;
+    };
   } // (import ../utils/nix/default.nix) {};
 
+  pulseaudio = true;
+
   allowUnfree = true;
 
   chromium = {
     enableWideVine = true;
     hiDPI = true;
   };
-
-  mpv = {
-    vaapiSupport = true;
-  };
 }