diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/upnp.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/upnp.scm')
| -rw-r--r-- | gnu/packages/upnp.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index cc20ca3e21..22d3f88cd0 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -63,7 +63,7 @@ ;; the configure phase. `(#:make-flags (list - (string-append "SH=" (assoc-ref %build-inputs "bash") "/bin/sh") + (string-append "SH=" (search-input-file %build-inputs "/bin/sh")) (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out")) ,(string-append "CC=" (cc-for-target)) @@ -96,16 +96,16 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.14.7") + (version "1.14.12") (source (origin (method url-fetch) (uri (string-append "https://github.com/pupnp/pupnp/releases/download" "/release-" version "/libupnp-" version".tar.bz2")) (sha256 - (base32 "093wmhk7rdmg2ixyam4hpxa43g25555jgb3i4y7223mwhr5aqrkv")))) + (base32 "1b5mnn01cx840paggxrajg63gqzmw8mi4p14jhi9r4qyvam80709")))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (build-system gnu-build-system) (arguments ;; The tests require a network device capable of multicasting which is |