diff mbox

[4/8] gnu: freedesktop: Add libinput-minimal.

Message ID 20160729082357.17501-4-david@craven.ch
State New
Headers show

Commit Message

David Craven July 29, 2016, 8:23 a.m. UTC
* gnu/packages/freedesktop.scm: New variable.
---
 gnu/packages/freedesktop.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Comments

Vincent Legoll July 29, 2016, 11:25 a.m. UTC | #1
> @@ -97,8 +97,8 @@ freedesktop.org project.")
>       `(("libudev" ,eudev))) ; required by libinput.pc
>      (inputs
>       `(("libevdev" ,libevdev)
> -       ("mtdev" ,mtdev)
> -       ("libwacom" ,libwacom)))
> +       ("libwacom" ,libwacom)
> +       ("mtdev" ,mtdev)))
>      (home-page "https://www.freedesktop.org/wiki/Software/libinput/")
>      (synopsis "Input devices handling library")
>      (description

Is this kind of reordering wanted ?

I ask, because this is a major source of unneeded merge conflicts, for
a dubious reason, IMHO.

Or is there a real incentive to do that ?

I know a lot of projects that would simply ask you to resend the patch
without those modifications...

Why not doing it scripted, all at once, a flag-day...
David Craven July 29, 2016, 12:53 p.m. UTC | #2
I'll resubmit the patch. I was thinking about removing it from the
patch while I was going through the select commits for patch-set/clean
up phase. I thought someone can complain if they want =P
Vincent Legoll July 29, 2016, 1:13 p.m. UTC | #3
Hi David,

My question was not aimed directly at your patch but rather
more generally at the guix dev community.

So, WDOT ?
Ludovic Courtès July 29, 2016, 3:40 p.m. UTC | #4
David Craven <david@craven.ch> skribis:

> * gnu/packages/freedesktop.scm: New variable.

Applied minus the unwanted changes that Vincent pointed out.

Ludo’.
diff mbox

Patch

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 458331d..fb7717b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -86,7 +86,7 @@  freedesktop.org project.")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://freedesktop.org/software/libinput/"
-                                  name "-" version ".tar.xz"))
+                                  "libinput-" version ".tar.xz"))
               (sha256
                (base32
                 "085lcxy111j8r1lwyghsc6zrysqh0vg8xip5axxsdl8r8n3i1vvn"))))
@@ -97,8 +97,8 @@  freedesktop.org project.")
      `(("libudev" ,eudev))) ; required by libinput.pc
     (inputs
      `(("libevdev" ,libevdev)
-       ("mtdev" ,mtdev)
-       ("libwacom" ,libwacom)))
+       ("libwacom" ,libwacom)
+       ("mtdev" ,mtdev)))
     (home-page "https://www.freedesktop.org/wiki/Software/libinput/")
     (synopsis "Input devices handling library")
     (description
@@ -106,6 +106,16 @@  freedesktop.org project.")
 other applications that need to directly deal with input devices.")
     (license license:x11)))
 
+(define-public libinput-minimal
+  (package (inherit libinput)
+    (name "libinput-minimal")
+    (inputs
+     `(("libevdev" ,libevdev)
+       ("mtdev" ,mtdev)))
+    (arguments
+      `(#:configure-flags
+        '("--disable-libwacom")))))
+
 (define-public libxdg-basedir
   (package
     (name "libxdg-basedir")