summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Boulain <kevinboulain@gmail.com>2022-03-15 00:06:47 +0100
committerGuix Patches Tester <>2022-03-14 23:08:43 +0000
commitfa7ff6c768695f5f752598cd24c770841c68a765 (patch)
treee69304e24048f14253d7ccf457025cabfd8e37f3
parenta2a97bf674105ade682e1341fbee31d80b2fbbe2 (diff)
downloadguix-patches-fa7ff6c768695f5f752598cd24c770841c68a765.tar
guix-patches-fa7ff6c768695f5f752598cd24c770841c68a765.tar.gz
gnu: rename pipewire to pipewire-0.2 and pipewire-0.3 to pipewireseries-11626
* gnu/packages/chromium.scm (ungoogled-chromium): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/freedesktop.scm (weston): Change inputs from pipewire to pipewire-0.2. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/freedesktop.scm (xdg-desktop-portal-wlr): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/gnome.scm (mutter): Change native-inputs and inputs from pipewire-0.3 to pipewire. * gnu/packages/kde-systemtools.scm (krfb): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/linux.scm (pipewire): Rename to pipewire-0.2. * gnu/packages/linux.scm (pipewire-0.3): Rename to pipewire. * gnu/packages/linux.scm (wireplumber): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Change inputs from pipewire to pipewire-0.2. * gnu/packages/video.scm (obs): Change inputs from pipewire-0.3 to pipewire.
-rw-r--r--gnu/packages/chromium.scm2
-rw-r--r--gnu/packages/freedesktop.scm6
-rw-r--r--gnu/packages/gnome.scm4
-rw-r--r--gnu/packages/kde-systemtools.scm2
-rw-r--r--gnu/packages/linux.scm10
-rw-r--r--gnu/packages/telegram.scm2
-rw-r--r--gnu/packages/video.scm2
7 files changed, 14 insertions, 14 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 7ef1e5ac1b..f60c9719fe 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -849,7 +849,7 @@
opus+custom
pango
pciutils
- pipewire-0.3
+ pipewire
pulseaudio
re2
snappy
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 55bde8e705..b1248c466d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1120,7 +1120,7 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.")
("mtdev" ,mtdev)
("linux-pam" ,linux-pam)
("pango" ,pango)
- ("pipewire" ,pipewire)
+ ("pipewire" ,pipewire-0.2)
("wayland-protocols" ,wayland-protocols)
("xorg-server-xwayland" ,xorg-server-xwayland)))
(propagated-inputs
@@ -2313,7 +2313,7 @@ fallback to generic Systray support if none of those are available.")
("libportal" ,libportal)
("dbus" ,dbus)
("geoclue" ,geoclue)
- ("pipewire" ,pipewire-0.3)
+ ("pipewire" ,pipewire)
("fuse" ,fuse)))
(arguments
`(#:phases
@@ -2442,7 +2442,7 @@ interfaces.")
grim
iniparser
libinih
- pipewire-0.3
+ pipewire
slurp
wayland
wayland-protocols))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e0fc9a9f50..60ad41c57f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7552,7 +7552,7 @@ to display dialog boxes from the commandline and shell scripts.")
;; theme to please libxcursor.
("adwaita-icon-theme" ,adwaita-icon-theme)
("libxcursor" ,libxcursor) ;for XCURSOR_PATH
- ("pipewire" ,pipewire-0.3)
+ ("pipewire" ,pipewire)
("python" ,python)
("python-dbus" ,python-dbus)
("python-dbusmock" ,python-dbusmock)
@@ -7595,7 +7595,7 @@ to display dialog boxes from the commandline and shell scripts.")
("libxkbfile" ,libxkbfile)
("libxrandr" ,libxrandr)
("libxtst" ,libxtst)
- ("pipewire" ,pipewire-0.3)
+ ("pipewire" ,pipewire)
("startup-notification" ,startup-notification)
("sysprof" ,sysprof)
("upower-glib" ,upower)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 3fab9089f3..205cd24e9d 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -254,7 +254,7 @@ This package is part of the KDE base applications module.")
libxcb
libxtst
oxygen-icons ;; default icon set
- pipewire-0.3
+ pipewire
qtbase-5
qtx11extras
xcb-util-image
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 34c0c8e5da..f912d5b53f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8234,7 +8234,7 @@ set as @code{LD_PRELOAD} to override the C library file system functions.")
types and interfaces and translates so that the X server can use them.")
(license license:gpl2+)))
-(define-public pipewire
+(define-public pipewire-0.2
(package
(name "pipewire")
(version "0.2.7")
@@ -8276,9 +8276,9 @@ and Flatpak we expect PipeWire to provide a core building block for the future
of Linux application development.")
(license license:lgpl2.0+)))
-(define-public pipewire-0.3
+(define-public pipewire
(package
- (inherit pipewire)
+ (inherit pipewire-0.2)
(name "pipewire")
(version "0.3.48")
(source (origin
@@ -8300,7 +8300,7 @@ of Linux application development.")
(modify-phases %standard-phases
;; Skip shrink-runpath, otherwise validate-runpath fails.
(delete 'shrink-runpath))))
- (inputs (modify-inputs (package-inputs pipewire)
+ (inputs (modify-inputs (package-inputs pipewire-0.2)
(prepend avahi
bluez
jack-2
@@ -8336,7 +8336,7 @@ of Linux application development.")
(native-inputs
(list `(,glib "bin")
pkg-config))
- (inputs (list dbus elogind glib lua pipewire-0.3))
+ (inputs (list dbus elogind glib lua pipewire))
(home-page "https://gitlab.freedesktop.org/pipewire/wireplumber")
(synopsis "Session / policy manager implementation for PipeWire")
(description "WirePlumber is a modular session / policy manager for
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 6c5efc50b9..4213ac6e4e 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -166,7 +166,7 @@
("libxrandr" ,libxrandr)
("openssl" ,openssl)
("opus" ,opus)
- ("pipewire" ,pipewire)
+ ("pipewire" ,pipewire-0.2)
("protobuf" ,protobuf)
("pulseaudio" ,pulseaudio)
("x11" ,libx11)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..a5298ccfac 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3429,7 +3429,7 @@ be used for realtime video capture via Linux-specific APIs.")
libxcomposite
mbedtls-apache
mesa
- pipewire-0.3
+ pipewire
pulseaudio
qtbase-5
qtsvg