From 48dde66cd740ecfae65df7cd54df4193c67c47b3 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.git@hrdinka.at>
Date: Tue, 8 Mar 2016 13:35:03 +0100
Subject: [PATCH] communi: fix output paths

---
 .../networking/irc/communi/default.nix        | 19 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 05a59719902..65a526b88af 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,5 +1,4 @@
-{ fetchgit, libcommuni, qt5, stdenv
-}:
+{ fetchgit, libcommuni, makeQtWrapper, qt5, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "communi-${version}";
@@ -11,20 +10,32 @@ stdenv.mkDerivation rec {
     sha256 = "0gk6gck09zb44qfsal7bs4ln2vl9s9x3vfxh7jvfc7mmf7l3sspd";
   };
 
+  nativeBuildInputs = [ makeQtWrapper ];
+
   buildInputs = [ libcommuni qt5.qtbase ];
 
   enableParallelBuild = true;
 
   configurePhase = ''
     export QMAKEFEATURES=${libcommuni}/features
-    qmake -r COMMUNI_INSTALL_PREFIX=$out
+    qmake -r \
+      COMMUNI_INSTALL_PREFIX=$out \
+      COMMUNI_INSTALL_BINS=$out/bin \
+      COMMUNI_INSTALL_PLUGINS=$out/lib/communi/plugins \
+      COMMUNI_INSTALL_ICONS=$out/share/icons/hicolor \
+      COMMUNI_INSTALL_DESKTOP=$out/share/applications \
+      COMMUNI_INSTALL_THEMES=$out/share/communi/themes
+  '';
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/communi"
   '';
 
   meta = with stdenv.lib; {
     description = "A simple and elegant cross-platform IRC client";
     homepage = https://github.com/communi/communi-desktop;
     license = licenses.bsd3;
-    platforms = platforms.all;
     maintainers = with maintainers; [ hrdinka ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 331879971e3..507fb957a84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11729,7 +11729,7 @@ let
     pulseaudioSupport = config.pulseaudio or false;
   };
 
-  communi = callPackage ../applications/networking/irc/communi { };
+  communi = qt5.callPackage ../applications/networking/irc/communi { };
 
   CompBus = callPackage ../applications/audio/CompBus { };