cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

purple-matrix: pname, fix cflags, restore hardening

Browse source
This commit is contained in:
Will Dietz 2019-07-26 10:09:10 -05:00
parent b01407602c
commit e651f5d516
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
View file

@ -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 stdenv.mkDerivation rec {
version = "2018-08-03";
in
stdenv.mkDerivation {
pname = "purple-matrix-unstable"; pname = "purple-matrix-unstable";
inherit version; version = "2019-06-06";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/matrix-org/purple-matrix"; owner = "matrix-org";
rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0"; repo = "purple-matrix";
sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; rev = "4494ba22b479917f0b1f96a3019792d3d75bcff1";
sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm";
}; };
# glib-2.62 deprecations NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; # glib-2.62 deprecations
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"
# override "-O0 -Werror" set by build system
"-O3" "-Wno-error"
];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
makeFlags = [ makeFlags = [
"PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
"DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"