communi: fix output paths

This commit is contained in:
Christoph Hrdinka 2016-03-08 13:35:03 +01:00
parent 5603159c4f
commit 48dde66cd7
2 changed files with 16 additions and 5 deletions

View File

@ -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;
};
}

View File

@ -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 { };