diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-03 16:13:08 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-03 16:14:17 +0200 |
commit | 956790acafd6852e3d7764184a4cb0a73790559c (patch) | |
tree | 241422d38833ec03770f5951e75920c207a7ec0d /pkgs/applications/networking/instant-messengers/pidgin-plugins | |
parent | 5f598234c602133006a2d6c8e4aebcd18fe9b2e8 (diff) | |
parent | 7de2b6240b005203e2015f110598ac4805cf24f8 (diff) |
Merge #45974: purple-matrix: 2016-07-11 -> 2018-08-02
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/pidgin-plugins')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index a6d893fd95a47..d4a26a266c307 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,30 +1,32 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } : +{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : let - version = "2016-07-11"; + version = "2018-08-03"; in stdenv.mkDerivation rec { name = "purple-matrix-unstable-${version}"; src = fetchgit { url = "https://github.com/matrix-org/purple-matrix"; - rev = "f9d36198a57de1cd1740a3ae11c2ad59b03b724a"; - sha256 = "1mmyvc70gslniphmcpk8sfl6ylik6dnprqghx4n47gsj1sb1cy00"; + rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0"; + sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json-glib glib http-parser ]; + buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; - installPhase = '' - install -Dm755 -t $out/lib/pidgin/ libmatrix.so - for size in 16 22 48; do - install -TDm644 matrix-"$size"px.png $out/pixmaps/pidgin/protocols/$size/matrix.png - done - ''; + hardeningDisable = [ "fortify" ]; # upstream compiles with -O0 - meta = { + makeFlags = [ + "DESTDIR=$(out)" + "PLUGIN_DIR_PURPLE=/lib/pidgin/" + "DATA_ROOT_DIR_PURPLE=/share" + ]; + + meta = with stdenv.lib; { homepage = https://github.com/matrix-org/purple-matrix; description = "Matrix support for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ symphorien ]; }; } |