diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-11-16 09:46:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-16 09:46:14 +0000 |
| commit | 9d21910e0864ab36f617b23a229fbe05117013ec (patch) | |
| tree | 7e6a33fcbc853bec22ab1c5f02d893a137b11d86 /pkgs/applications/networking/instant-messengers/pidgin-plugins | |
| parent | 206c264c7dd885efce2df4807fef6a7f268501ae (diff) | |
| parent | e651f5d5168331f942c38ee7764f71a12f963d23 (diff) | |
Merge pull request #65427 from dtzWill/update/purple-matrix
purple-matrix: pname, fix cflags, restore hardening
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, 14 insertions, 14 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 8a15a3bdd85ea..44133e777c762 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,26 +1,26 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : -let - version = "2018-08-03"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "purple-matrix-unstable"; - inherit version; + version = "2019-06-06"; - src = fetchgit { - url = "https://github.com/matrix-org/purple-matrix"; - rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0"; - sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "purple-matrix"; + rev = "4494ba22b479917f0b1f96a3019792d3d75bcff1"; + sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm"; }; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = [ + # glib-2.62 deprecations + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + # override "-O0 -Werror" set by build system + "-O3" "-Wno-error" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; - hardeningDisable = [ "fortify" ]; # upstream compiles with -O0 - makeFlags = [ "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" |