diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 382044bec5a7..8b467a868b5c 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -2,12 +2,13 @@ stdenv.mkDerivation rec { name = "communi-${version}"; - version = "2016-01-03"; + version = "2016-08-19"; src = fetchgit { url = "https://github.com/communi/communi-desktop.git"; - rev = "ad1b9a30ed6c51940c0d2714b126a32b5d68c876"; - sha256 = "0jx963pfvzk4dbk8mrmzfrhzybk5y6ib9yzaj662wliayrzj7vpg"; + rev = "d516b01b1382a805de65f21f3475e0a8e64a97b5"; + sha256 = "1pn7mr7ch1ck5qv9zdn3ril40c9kk6l04475564rpzf11jly76an"; + fetchSubmodules = true; }; nativeBuildInputs = [ makeQtWrapper qmakeHook ]; @@ -34,6 +35,10 @@ stdenv.mkDerivation rec { --replace "/usr/bin" "$out/bin" ''; + postFixup = '' + patchelf --set-rpath "$out/lib:$(patchelf --print-rpath $out/bin/.communi-wrapped)" $out/bin/.communi-wrapped + ''; + meta = with stdenv.lib; { description = "A simple and elegant cross-platform IRC client"; homepage = https://github.com/communi/communi-desktop; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 77199bf27a3e..06a7f54e42ba 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -1,17 +1,18 @@ -{ fetchgit, qtbase, qmakeHook, which, stdenv +{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmakeHook, which }: stdenv.mkDerivation rec { name = "libcommuni-${version}"; - version = "2016-03-23"; + version = "2016-08-17"; - src = fetchgit { - url = "https://github.com/communi/libcommuni.git"; - rev = "6a5110b25e2838e7dc2c62d16b9fd06d12beee7e"; - sha256 = "184ah5xqg5pgy8h6fyyz2k0vak1fmhrcidwz828yl4lsvz1vjqh1"; + src = fetchFromGitHub { + owner = "communi"; + repo = "libcommuni"; + rev = "dedba6faf57c31c8c70fd563ba12d75a9caee8a3"; + sha256 = "0wvs53z34vfs5xlln4a6sbd4981svag89xm0f4k20mb1i052b20i"; }; - buildInputs = [ qtbase ]; + buildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ qmakeHook which ]; enableParallelBuild = true;