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/wxwidgets.scm | |
| parent | 6a2546f92d07df04e5d700924edd027ed1e2ef11 (diff) | |
| parent | c762df54786fd6f005f3b5307323f1d2df3cbf0b (diff) | |
| download | guix-533a893cc6b03f100566760d6e0c8e0500ed7082.tar.gz guix-533a893cc6b03f100566760d6e0c8e0500ed7082.zip | |
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/wxwidgets.scm')
| -rw-r--r-- | gnu/packages/wxwidgets.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index f3a7fdd7a4..423da37a3c 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -152,7 +152,7 @@ and many other languages.") #t))))))) (define-public wxwidgets-gtk2 - (package (inherit wxwidgets) + (package/inherit wxwidgets (inputs `(("gtk+" ,gtk+-2) ,@(alist-delete "gtk+" @@ -183,7 +183,7 @@ and many other languages.") `(cons "--enable-mediactrl" ,flags)))))) (define-public wxwidgets-gtk2-3.1 - (package (inherit wxwidgets-3.1) + (package/inherit wxwidgets-3.1 (inputs `(("gtk+" ,gtk+-2) ,@(alist-delete "gtk+" |