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

Merge pull request #271174 from helsinki-systems/fix/sogo

Browse source 
sogo: fix build
This commit is contained in:
Janne Heß 2023-12-01 11:45:11 +01:00 committed by GitHub
commit 954c4d37ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/libraries/sope/default.nix
View file

@ -3,29 +3,23 @@
gnustep.stdenv.mkDerivation rec {
pname = "sope";
version = "5.8.0";
version = "5.9.0";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOPE-${version}";
hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc=";
hash = "sha256-JZh8sC/w2MRy3UyWYGMvU47XtWKGnLuUlCsVyyxd7zg=";
};
patches = [
(fetchpatch {
name = "sope-no-unnecessary-vars.patch";
url = "https://github.com/Alinto/sope/commit/0751a2f11961fd7de4e2728b6e34e9ba4ba5887e.patch";
hash = "sha256-1txj8Qehg2N7ZsiYQA2FXI4peQAE3HUwDYkJEP9WnEk=";
})
(fetchpatch {
name = "sope-fix-wformat.patch";
url = "https://github.com/Alinto/sope/commit/6adfadd5dd2da4041657ad071892f2c9b1704d22.patch";
hash = "sha256-zCbvVdbeBeNo3/cDVdYbyUUC2z8D6Q5ga0plUoMqr98=";
(fetchpatch { # https://github.com/Alinto/sope/pull/66
name = "sope-fix-gnustep-1.29.0+.patch";
url = "https://github.com/Alinto/sope/pull/66/commits/9ec2744cc851b11886c3ebb723138e4d672bd5c7.patch";
hash = "sha256-JgYRwjmjlitgzYz9Jfei5XJRThP1TunPjI0g5M2wZPA=";
})
];
hardeningDisable = [ "format" ];
nativeBuildInputs = [ gnustep.make ];
buildInputs = [ gnustep.base libxml2 openssl ]
++ lib.optional (openldap != null) openldap
@ -49,7 +43,10 @@ gnustep.stdenv.mkDerivation rec {
++ lib.optional (mariadb != null) "--enable-mysql"
++ lib.optional (postgresql != null) "--enable-postgresql";
env.GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";
env = {
GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
};
# Move over the makefiles (see comment over preConfigure)
postInstall = ''

3
pkgs/servers/web-apps/sogo/default.nix
View file

@ -7,6 +7,7 @@ gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
version = "5.9.0";
# always update the sope package as well, when updating sogo
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
@ -44,6 +45,8 @@ gnustep.stdenv.mkDerivation rec {
"--enable-mfa"
];
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int";
preFixup = ''
# Create gnustep.conf
mkdir -p $out/share/GNUstep