Hello Paul Paul van der Walt <[email protected]> writes:
> > From dc8d0477c0644e9d54ebba6af955c3d4e29270fc Mon Sep 17 00:00:00 2001 > > From: Cyrill Schenkel <[email protected]> > > Date: Fri, 23 Oct 2015 13:25:11 +0200 > > Subject: [PATCH] gnu: Add xcompmgr > > > > * gnu/packages/xorg.scm (xcompmgr): New variable. > > --- > > gnu/packages/xorg.scm | 41 +++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 41 insertions(+) > > > > diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm > > index b39bbd4..d51cd30 100644 > > --- a/gnu/packages/xorg.scm > > +++ b/gnu/packages/xorg.scm > > @@ -4,6 +4,7 @@ > > [...] > > + (arguments > > + `(#:phases (modify-phases %standard-phases > > + (add-before 'configure 'autogen > > + (lambda _ > > + (setenv "NOCONFIGURE" "t") > > + (zero? (system* "./autogen.sh"))))))) > > + (native-inputs > > [...] > > Mark Weaver recently told me that autogen phases should be after 'unpack > instead of before 'configure, since the MIPS platform (and perhaps > others) sometimes need to adjust the output of autogen.sh. Yes, you're right. I changed it accordingly. > ...and another thing while i'm at it, although i'm less sure about this > one... > > On 2015-10-23 at 11:46, quoth Paul van der Walt: >>> + (setenv "NOCONFIGURE" "t") > > Does that do what i think it does? If so, why not just use something > like the following? > > (modify-phases %standard-phases > (delete 'configure) > ...) It does what you think it does. If I did omit it, I'd need to patch the `autogen.sh` file so that it passes the neccessary parameters to the configure script and I'd also need to set the neccessary environment variables. It seems to me that setting the `NOCONFIGURE` environment variable is by far the simpler solution. Regards, Cyrill
>From 55122d4c14231f3646db902bc2b88469fc96666e Mon Sep 17 00:00:00 2001 From: Cyrill Schenkel <[email protected]> Date: Fri, 23 Oct 2015 16:38:16 +0200 Subject: [PATCH] gnu: Add xcompmgr * gnu/packages/xorg.scm (xcompmgr): New variable. --- gnu/packages/xorg.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b39bbd4..e237754 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2014, 2015 Eric Bavier <[email protected]> ;;; Copyright © 2015 Ludovic Courtès <[email protected]> ;;; Copyright © 2015 Eric Dvorsak <[email protected]> +;;; Copyright © 2015 Cyrill Schenkel <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -5439,3 +5440,43 @@ perl programs to display windows and graphics on X11 servers.") ;; of the extension modules in the directory Protocol/Ext: see those files ;; for details)." (license (package-license perl)))) + +(define-public xcompmgr + (package + (name "xcompmgr") + (version "1.1.7") + (source + (origin + ;; there's no current tarball + (method git-fetch) + (uri (git-reference + (url "http://anongit.freedesktop.org/git/xorg/app/xcompmgr.git") + (commit (string-append name "-" version)))) + (sha256 + (base32 + "04swkrm3gk689wrjc418bd3n25w8r20kg1xfbn5j8d7mx1r5gf16")) + (file-name (string-append name "-" version)))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (setenv "NOCONFIGURE" "t") + (zero? (system* "sh" "autogen.sh"))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("libX11" ,libx11) + ("libXext" ,libxext) + ("libXcomposite" ,libxcomposite) + ("libXfixes" ,libxfixes) + ("libXdamage" ,libxdamage) + ("libXrender" ,libxrender))) + (synopsis "X Compositing manager using RENDER") + (description "xcompmgr is a sample compositing manager for X servers +supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables +basic eye-candy effects.") + (home-page "http://cgit.freedesktop.org/xorg/app/xcompmgr/") + (license (license:x11-style "file://COPYING")))) -- 2.5.0
