From 5b223d457e523da555cf7bc293b808f5bab4560f Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Thu, 20 Feb 2014 13:31:16 +0400
Subject: zathura: set default window-icon

---
 pkgs/applications/misc/zathura/core/default.nix | 9 +++++++--
 pkgs/applications/misc/zathura/default.nix      | 7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index b86107890d8..933882c940b 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }:
 
 stdenv.mkDerivation rec {
   version = "0.2.7";
@@ -21,7 +21,12 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
 
   postInstall = ''
-    wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin"
+    wrapProgram "$out/bin/zathura" \
+      --prefix PATH ":" "${file}/bin" \
+      --prefix XDG_CONFIG_DIRS ":" "$out/etc"
+
+    mkdir -pv $out/etc
+    echo "set window-icon ${zathura_icon}" > $out/etc/zathurarc
   '';
 
   meta = {
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 2ee32f77c1e..f943bff7bf0 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -3,8 +3,11 @@
 rec {
   inherit (pkgs) stdenv;
 
+  icon = ./icon.xpm;
+
   zathura_core = callPackage ./core {
     gtk = pkgs.gtk3;
+    zathura_icon = icon;
   };
 
   zathura_pdf_poppler = callPackage ./pdf-poppler { };
@@ -19,7 +22,7 @@ rec {
 
   zathuraWrapper = stdenv.mkDerivation {
 
-    inherit zathura_core;
+    inherit zathura_core icon;
 
     name = "zathura-${zathura_core.version}";
 
@@ -29,8 +32,6 @@ rec {
       zathura_ps
     ];
 
-    icon = ./icon.xpm;
-
     builder = ./builder.sh;
 
     preferLocalBuild = true;
-- 
cgit 1.4.1