Thanks for the patch!

However, there is some work duplication here it seems, look at 
https://issues.guix.gnu.org/47006 - let's cooperate there! Please do
suggest changes to the existing patches according to your submitted
patch here.