Archived
1
0
Fork 0

gnu: xorg-server: Fix indentation.

* gnu/packages/xorg.scm (xorg-server): Fix indentation.  Remove trailing #t.
This commit is contained in:
Maxim Cournoyer 2021-11-05 23:56:45 -04:00
parent 8265e209b3
commit bfa1e12bb8
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -5396,63 +5396,63 @@ by the Xorg server.")
(name "xorg-server") (name "xorg-server")
(version "21.1.0") (version "21.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://xorg.freedesktop.org/archive/individual" (uri (string-append "https://xorg.freedesktop.org/archive/individual"
"/xserver/xorg-server-" version ".tar.xz")) "/xserver/xorg-server-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0hpyq51sf7f5yqq87zgcdiidfmb8r93am1djvxhcnwj4izfidhsh")) "0hpyq51sf7f5yqq87zgcdiidfmb8r93am1djvxhcnwj4izfidhsh"))
(patches (patches
(list (list
;; See: ;; See:
;; https://lists.fedoraproject.org/archives/list/devel@lists. ;; https://lists.fedoraproject.org/archives/list/devel@lists.
;; fedoraproject.org/message/JU655YB7AM4OOEQ4MOMCRHJTYJ76VFOK/ ;; fedoraproject.org/message/JU655YB7AM4OOEQ4MOMCRHJTYJ76VFOK/
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-server.git" "http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-server.git"
"/plain/06_use-intel-only-on-pre-gen4.diff")) "/plain/06_use-intel-only-on-pre-gen4.diff"))
(sha256 (sha256
(base32 (base32
"0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q")) "0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q"))
(file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
;; The following libraries are required by xorg-server.pc. ;; The following libraries are required by xorg-server.pc.
`(("libpciaccess" ,libpciaccess) `(("libpciaccess" ,libpciaccess)
("libxcvt" ,libxcvt) ("libxcvt" ,libxcvt)
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(inputs (inputs
`(("udev" ,eudev) `(("udev" ,eudev)
("dbus" ,dbus) ("dbus" ,dbus)
("libdmx" ,libdmx) ("libdmx" ,libdmx)
("libepoxy" ,libepoxy) ("libepoxy" ,libepoxy)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("libxau" ,libxau) ("libxau" ,libxau)
("libxaw" ,libxaw) ("libxaw" ,libxaw)
("libxdmcp" ,libxdmcp) ("libxdmcp" ,libxdmcp)
("libxfixes" ,libxfixes) ("libxfixes" ,libxfixes)
("libxfont2" ,libxfont2) ("libxfont2" ,libxfont2)
("libxkbfile" ,libxkbfile) ("libxkbfile" ,libxkbfile)
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxres" ,libxres) ("libxres" ,libxres)
("libxshmfence" ,libxshmfence) ("libxshmfence" ,libxshmfence)
("libxt" ,libxt) ("libxt" ,libxt)
("libxv" ,libxv) ("libxv" ,libxv)
("xkbcomp" ,xkbcomp) ("xkbcomp" ,xkbcomp)
("xkeyboard-config" ,xkeyboard-config) ("xkeyboard-config" ,xkeyboard-config)
("xtrans" ,xtrans) ("xtrans" ,xtrans)
("zlib" ,zlib) ("zlib" ,zlib)
;; Inputs for Xephyr ;; Inputs for Xephyr
("xcb-util" ,xcb-util) ("xcb-util" ,xcb-util)
("xcb-util-image" ,xcb-util-image) ("xcb-util-image" ,xcb-util-image)
("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-keysyms" ,xcb-util-keysyms)
("xcb-util-renderutil" ,xcb-util-renderutil) ("xcb-util-renderutil" ,xcb-util-renderutil)
("xcb-util-wm" ,xcb-util-wm))) ("xcb-util-wm" ,xcb-util-wm)))
(native-inputs (native-inputs
`(("python" ,python-wrapper) `(("python" ,python-wrapper)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
@ -5464,7 +5464,7 @@ by the Xorg server.")
"/share/X11/xkb") "/share/X11/xkb")
(string-append "--with-xkb-output=" (string-append "--with-xkb-output="
"/tmp") ; FIXME: This is a bit doubtful; where should "/tmp") ; FIXME: This is a bit doubtful; where should
; the compiled keyboard maps go? ; the compiled keyboard maps go?
(string-append "--with-xkb-bin-directory=" (string-append "--with-xkb-bin-directory="
(assoc-ref %build-inputs "xkbcomp") (assoc-ref %build-inputs "xkbcomp")
"/bin") "/bin")
@ -5483,7 +5483,6 @@ by the Xorg server.")
;; For sddm. ;; For sddm.
"--enable-kdrive" "--enable-kdrive"
"--enable-xephyr") "--enable-xephyr")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
@ -5502,9 +5501,7 @@ by the Xorg server.")
(("^BUILD_DATE=.*$") (("^BUILD_DATE=.*$")
"BUILD_DATE=19700101\n") "BUILD_DATE=19700101\n")
(("^BUILD_TIME=.*$") (("^BUILD_TIME=.*$")
"BUILD_TIME=000001\n")) "BUILD_TIME=000001\n")))))))
#t)))))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
(synopsis "Xorg implementation of the X Window System") (synopsis "Xorg implementation of the X Window System")
(description (description