diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
commit | 533a893cc6b03f100566760d6e0c8e0500ed7082 (patch) | |
tree | 0ecbf89895a400c43d16bb1f6539f1a88aeaa4cf /gnu/packages/libcanberra.scm | |
parent | 6a2546f92d07df04e5d700924edd027ed1e2ef11 (diff) | |
parent | c762df54786fd6f005f3b5307323f1d2df3cbf0b (diff) | |
download | guix-533a893cc6b03f100566760d6e0c8e0500ed7082.tar.gz |
Merge branch 'master' into staging
Conflicts: .guix-authorizations gnu/ci.scm gnu/packages/base.scm gnu/packages/databases.scm gnu/packages/gnome.scm gnu/packages/gtk.scm gnu/packages/imagemagick.scm gnu/packages/password-utils.scm gnu/packages/python-xyz.scm gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/libcanberra.scm')
-rw-r--r-- | gnu/packages/libcanberra.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 2d08fb46e3..e263ba2efc 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -105,7 +105,7 @@ null) and is designed to be portable.") (license lgpl2.1+))) (define-public libcanberra/gtk+-2 - (package (inherit libcanberra) + (package/inherit libcanberra (name "libcanberra-gtk2") (inputs `(,@(alist-delete "gtk+" (package-inputs libcanberra)) ("gtk+" ,gtk+-2))))) |