1 files changed, 10 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/sope/default.nix b/nixpkgs/pkgs/development/libraries/sope/default.nix
index 0b61047377f3..fba7517ccca6 100644
--- a/nixpkgs/pkgs/development/libraries/sope/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sope/default.nix
@@ -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 = ''