pyrox.dev
Merge pull request #271174 from helsinki-systems/fix/sogo
sogo: fix build
+10
-13
pkgs/development/libraries/sope/default.nix
+10
-13
pkgs/development/libraries/sope/default.nix
···
3
3
4
4
gnustep.stdenv.mkDerivation rec {
5
5
pname = "sope";
6
-
version = "5.8.0";
6
+
version = "5.9.0";
7
7
8
8
src = fetchFromGitHub {
9
9
owner = "inverse-inc";
10
10
repo = pname;
11
11
rev = "SOPE-${version}";
12
-
hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc=";
12
+
hash = "sha256-JZh8sC/w2MRy3UyWYGMvU47XtWKGnLuUlCsVyyxd7zg=";
13
13
};
14
14
15
15
patches = [
16
-
(fetchpatch {
17
-
name = "sope-no-unnecessary-vars.patch";
18
-
url = "https://github.com/Alinto/sope/commit/0751a2f11961fd7de4e2728b6e34e9ba4ba5887e.patch";
19
-
hash = "sha256-1txj8Qehg2N7ZsiYQA2FXI4peQAE3HUwDYkJEP9WnEk=";
20
-
})
21
-
(fetchpatch {
22
-
name = "sope-fix-wformat.patch";
23
-
url = "https://github.com/Alinto/sope/commit/6adfadd5dd2da4041657ad071892f2c9b1704d22.patch";
24
-
hash = "sha256-zCbvVdbeBeNo3/cDVdYbyUUC2z8D6Q5ga0plUoMqr98=";
16
+
(fetchpatch { # https://github.com/Alinto/sope/pull/66
17
+
name = "sope-fix-gnustep-1.29.0+.patch";
18
+
url = "https://github.com/Alinto/sope/pull/66/commits/9ec2744cc851b11886c3ebb723138e4d672bd5c7.patch";
19
+
hash = "sha256-JgYRwjmjlitgzYz9Jfei5XJRThP1TunPjI0g5M2wZPA=";
25
20
})
26
21
];
27
22
28
-
hardeningDisable = [ "format" ];
29
23
nativeBuildInputs = [ gnustep.make ];
30
24
buildInputs = [ gnustep.base libxml2 openssl ]
31
25
++ lib.optional (openldap != null) openldap
···
49
43
++ lib.optional (mariadb != null) "--enable-mysql"
50
44
++ lib.optional (postgresql != null) "--enable-postgresql";
51
45
52
-
env.GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";
46
+
env = {
47
+
GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";
48
+
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
49
+
};
53
50
54
51
# Move over the makefiles (see comment over preConfigure)
55
52
postInstall = ''
+3
pkgs/servers/web-apps/sogo/default.nix
+3
pkgs/servers/web-apps/sogo/default.nix
···
7
7
pname = "SOGo";
8
8
version = "5.9.0";
9
9
10
+
# always update the sope package as well, when updating sogo
10
11
src = fetchFromGitHub {
11
12
owner = "inverse-inc";
12
13
repo = pname;
···
43
44
"--with-ssl=ssl"
44
45
"--enable-mfa"
45
46
];
47
+
48
+
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int";
46
49
47
50
preFixup = ''
48
51
# Create gnustep.conf