summary refs log tree commit diff
path: root/pkgs/development/ruby-modules
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-05-22 20:13:48 +0200
committerGitHub <noreply@github.com>2021-05-22 20:13:48 +0200
commit91f69cd0ad40d938d7433602bf8bba52190c9d2d (patch)
tree1136cae7c23e150a82947c22ab1236f2fcc2e37c /pkgs/development/ruby-modules
parentfc9a86afb02c76e432743e145021ddd188345286 (diff)
parent0d6b6931b77a332ac5fc3503603f4a31c092cdc9 (diff)
downloadnixpkgs-91f69cd0ad40d938d7433602bf8bba52190c9d2d.tar
nixpkgs-91f69cd0ad40d938d7433602bf8bba52190c9d2d.tar.gz
nixpkgs-91f69cd0ad40d938d7433602bf8bba52190c9d2d.tar.bz2
nixpkgs-91f69cd0ad40d938d7433602bf8bba52190c9d2d.tar.lz
nixpkgs-91f69cd0ad40d938d7433602bf8bba52190c9d2d.tar.xz
nixpkgs-91f69cd0ad40d938d7433602bf8bba52190c9d2d.tar.zst
nixpkgs-91f69cd0ad40d938d7433602bf8bba52190c9d2d.zip
Merge pull request #123445 from jnetod/zhf-ruby-libvirt
rubyPackages.ruby-libvirt: fix build with ruby 3.x
Diffstat (limited to 'pkgs/development/ruby-modules')
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 1a09ce60c04..5f054e6b996 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -528,6 +528,14 @@ in
       "--with-libvirt-include=${libvirt}/include"
       "--with-libvirt-lib=${libvirt}/lib"
     ];
+    dontBuild = false;
+    postPatch = ''
+      # https://gitlab.com/libvirt/libvirt-ruby/-/commit/43543991832c9623c00395092bcfb9e178243ba4
+      substituteInPlace ext/libvirt/common.c \
+        --replace 'st.h' 'ruby/st.h'
+      substituteInPlace ext/libvirt/domain.c \
+        --replace 'st.h' 'ruby/st.h'
+    '';
   };
 
   ruby-lxc = attrs: {