pyrox.dev
Merge pull request #18088 from groxxda/fix/libcommuni
libcommuni: 2016-03-23 -> 2016-08-17, communi 2016-01-03 -> 2016-08-19
authored by Franz Pletz and committed by GitHub 04ab7cee acca6d22
+8
-3
pkgs/applications/networking/irc/communi/default.nix
+8
-3
pkgs/applications/networking/irc/communi/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "communi-${version}";
5
-
version = "2016-01-03";
5
+
version = "2016-08-19";
6
6
7
7
src = fetchgit {
8
8
url = "https://github.com/communi/communi-desktop.git";
9
-
rev = "ad1b9a30ed6c51940c0d2714b126a32b5d68c876";
10
-
sha256 = "0jx963pfvzk4dbk8mrmzfrhzybk5y6ib9yzaj662wliayrzj7vpg";
9
+
rev = "d516b01b1382a805de65f21f3475e0a8e64a97b5";
10
+
sha256 = "1pn7mr7ch1ck5qv9zdn3ril40c9kk6l04475564rpzf11jly76an";
11
+
fetchSubmodules = true;
11
12
};
12
13
13
14
nativeBuildInputs = [ makeQtWrapper qmakeHook ];
···
32
33
wrapQtProgram "$out/bin/communi"
33
34
substituteInPlace "$out/share/applications/communi.desktop" \
34
35
--replace "/usr/bin" "$out/bin"
36
+
'';
37
+
38
+
postFixup = ''
39
+
patchelf --set-rpath "$out/lib:$(patchelf --print-rpath $out/bin/.communi-wrapped)" $out/bin/.communi-wrapped
35
40
'';
36
41
37
42
meta = with stdenv.lib; {
+8
-7
pkgs/development/libraries/libcommuni/default.nix
+8
-7
pkgs/development/libraries/libcommuni/default.nix
···
1
-
{ fetchgit, qtbase, qmakeHook, which, stdenv
1
+
{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmakeHook, which
2
2
}:
3
3
4
4
stdenv.mkDerivation rec {
5
5
name = "libcommuni-${version}";
6
-
version = "2016-03-23";
6
+
version = "2016-08-17";
7
7
8
-
src = fetchgit {
9
-
url = "https://github.com/communi/libcommuni.git";
10
-
rev = "6a5110b25e2838e7dc2c62d16b9fd06d12beee7e";
11
-
sha256 = "184ah5xqg5pgy8h6fyyz2k0vak1fmhrcidwz828yl4lsvz1vjqh1";
8
+
src = fetchFromGitHub {
9
+
owner = "communi";
10
+
repo = "libcommuni";
11
+
rev = "dedba6faf57c31c8c70fd563ba12d75a9caee8a3";
12
+
sha256 = "0wvs53z34vfs5xlln4a6sbd4981svag89xm0f4k20mb1i052b20i";
12
13
};
13
14
14
-
buildInputs = [ qtbase ];
15
+
buildInputs = [ qtbase qtdeclarative ];
15
16
nativeBuildInputs = [ qmakeHook which ];
16
17
17
18
enableParallelBuild = true;