summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-02-27 14:14:38 +0100
committerJan Tojnar <jtojnar@gmail.com>2022-02-28 15:18:35 +0100
commit165df3b4e130fe08d197588f845379edce40c184 (patch)
tree414bd63c548b3228309327455ddb19f582e9b25b
parent2d221a2a564361524537bbdfd375152f1736a158 (diff)
downloadnixpkgs-165df3b4e130fe08d197588f845379edce40c184.tar
nixpkgs-165df3b4e130fe08d197588f845379edce40c184.tar.gz
nixpkgs-165df3b4e130fe08d197588f845379edce40c184.tar.bz2
nixpkgs-165df3b4e130fe08d197588f845379edce40c184.tar.lz
nixpkgs-165df3b4e130fe08d197588f845379edce40c184.tar.xz
nixpkgs-165df3b4e130fe08d197588f845379edce40c184.tar.zst
nixpkgs-165df3b4e130fe08d197588f845379edce40c184.zip
libgda6: fix build
-rw-r--r--pkgs/development/libraries/libgda/6.x.nix15
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix
index 28235d65d98..c02c6116e64 100644
--- a/pkgs/development/libraries/libgda/6.x.nix
+++ b/pkgs/development/libraries/libgda/6.x.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , pkg-config
 , intltool
 , meson
@@ -37,6 +38,20 @@ stdenv.mkDerivation rec {
     sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr";
   };
 
+  patches = [
+    # Fix undefined behavior
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch";
+      sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk=";
+    })
+
+    # Fix building vapi
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch";
+      sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     intltool