ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-07 03:44:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mutter: Remove input labels.

Browse source 
* gnu/packages/gnome.scm (mutter)[native-inputs, inputs, propagated-inputs]:
Remove labels.
[arguments]: Use SEARCH-INPUT-FILE instead of labels.
This commit is contained in:
Marius Bakke 2022-09-10 02:04:15 +02:00
parent e9a32184fd
commit 6af5818262
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 71 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

145
gnu/packages/gnome.scm
View file

@ -7504,17 +7504,14 @@ (define-public mutter
"-Dsystemd=false" "-Dsystemd=false"
;; The following flags are needed for the bundled clutter ;; The following flags are needed for the bundled clutter
(string-append "-Dxwayland_path=" (string-append "-Dxwayland_path="
(assoc-ref %build-inputs "xorg-server-xwayland") (search-input-file %build-inputs "/bin/Xwayland"))
"/bin/Xwayland")
;; the remaining flags are needed for the bundled cogl ;; the remaining flags are needed for the bundled cogl
(string-append "-Dopengl_libname=" (string-append "-Dopengl_libname="
(assoc-ref %build-inputs "mesa") (search-input-file %build-inputs "/lib/libGL.so"))
"/lib/libGL.so")
(string-append "-Dgles2_libname=" (string-append "-Dgles2_libname="
(assoc-ref %build-inputs "mesa") (search-input-file %build-inputs "/lib/libGLESv2.so"))
"/lib/libGLESv2.so") "-Degl_device=true" ;false by default
"-Degl_device=true" ;false by default "-Dwayland_eglstream=true") ;false by default
"-Dwayland_eglstream=true") ;false by default
#:test-options #:test-options
(list "--verbose") (list "--verbose")
#:phases #:phases
@ -7523,10 +7520,10 @@ (define-public mutter
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/wayland/meta-wayland-egl-stream.c" (substitute* "src/wayland/meta-wayland-egl-stream.c"
(("libnvidia-egl-wayland.so.1") (("libnvidia-egl-wayland.so.1")
(string-append (assoc-ref inputs "egl-wayland") (search-input-file inputs
"/lib/libnvidia-egl-wayland.so.1"))))) "/lib/libnvidia-egl-wayland.so.1")))))
(add-before 'configure 'set-udev-dir (add-before 'configure 'set-udev-dir
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(setenv "PKG_CONFIG_UDEV_UDEVDIR" (setenv "PKG_CONFIG_UDEV_UDEVDIR"
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/lib/udev")))) "/lib/udev"))))
@ -7593,71 +7590,71 @@ (define-public mutter
(error "`meson test' exited with status" (error "`meson test' exited with status"
status)))))))))))) status))))))))))))
(native-inputs (native-inputs
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database (list desktop-file-utils ; for update-desktop-database
("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. `(,glib "bin") ; for glib-compile-schemas, etc.
("gobject-introspection" ,gobject-introspection) gobject-introspection
("intltool" ,intltool) intltool
("pkg-config" ,pkg-config) pkg-config
("xvfb-run" ,xvfb-run) xvfb-run
;; For git build ;; For git build
("autoconf" ,autoconf) autoconf
("automake" ,automake) automake
("libtool" ,libtool) libtool
;; For tests. ;; For tests.
;; Warnings are configured to be fatal during the tests; add an icon ;; Warnings are configured to be fatal during the tests; add an icon
;; theme to please libxcursor. ;; theme to please libxcursor.
("adwaita-icon-theme" ,adwaita-icon-theme) adwaita-icon-theme
("libxcursor" ,libxcursor) ;for XCURSOR_PATH libxcursor ;for XCURSOR_PATH
("pipewire" ,pipewire-0.3) pipewire-0.3
("python" ,python) python
("python-dbus" ,python-dbus) python-dbus
("python-dbusmock" ,python-dbusmock) python-dbusmock
("tini" ,tini))) ;acting as init (zombie reaper) tini)) ;acting as init (zombie reaper)
(propagated-inputs (propagated-inputs
`( ;; libmutter.pc refers to these: (list ;; libmutter.pc refers to these:
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) gsettings-desktop-schemas
("gtk+" ,gtk+) gtk+
;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
("atk" ,atk) atk
("cairo" ,cairo) cairo
("gdk-pixbuf" ,gdk-pixbuf) gdk-pixbuf
("glib" ,glib) glib
("json-glib" ,json-glib) json-glib
("libinput" ,libinput) libinput
("libx11" ,libx11) libx11
("libxcomposite" ,libxcomposite) libxcomposite
("libxcvt" ,libxcvt) libxcvt
("libxdamage" ,libxdamage) libxdamage
("libxext" ,libxext) libxext
("libxfixes" ,libxfixes) libxfixes
("libxkbcommon" ,libxkbcommon) libxkbcommon
("libxml2" ,libxml2) libxml2
("libxrandr" ,libxrandr) libxrandr
("mesa" ,mesa) mesa
("pango" ,pango) pango
("udev" ,eudev) eudev
("xinput" ,xinput))) xinput))
(inputs (inputs
`(("egl-wayland" ,egl-wayland) ;for wayland-eglstream-protocols (list egl-wayland ;for wayland-eglstream-protocols
("elogind" ,elogind) elogind
("gnome-desktop" ,gnome-desktop) gnome-desktop
("gnome-settings-daemon" ,gnome-settings-daemon) gnome-settings-daemon
("graphene" ,graphene) graphene
("libcanberra-gtk" ,libcanberra) libcanberra
("libgudev" ,libgudev) libgudev
("libice" ,libice) libice
("libsm" ,libsm) libsm
("libwacom" ,libwacom) libwacom
("libxkbfile" ,libxkbfile) libxkbfile
("libxrandr" ,libxrandr) libxrandr
("libxtst" ,libxtst) libxtst
("pipewire" ,pipewire-0.3) pipewire-0.3
("startup-notification" ,startup-notification) startup-notification
("sysprof" ,sysprof) sysprof
("upower-glib" ,upower) upower
("xkeyboard-config" ,xkeyboard-config) xkeyboard-config
("xorg-server-xwayland" ,xorg-server-xwayland) xorg-server-xwayland
("zenity" ,zenity))) zenity))
(synopsis "Window and compositing manager") (synopsis "Window and compositing manager")
(home-page "https://www.gnome.org") (home-page "https://www.gnome.org")
(description (description