From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH]: Add CUPS. Date: Mon, 5 Jan 2015 14:04:04 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y87Kf-0004JR-TZ for guix-devel@gnu.org; Mon, 05 Jan 2015 08:04:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y87Kb-0006q8-5o for guix-devel@gnu.org; Mon, 05 Jan 2015 08:04:29 -0500 Received: from pegasus.bbbm.mdc-berlin.de ([141.80.25.20]:45554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y87Ka-0006pE-Pt for guix-devel@gnu.org; Mon, 05 Jan 2015 08:04:25 -0500 Received: from localhost (localhost [127.0.0.1]) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTP id 41B88380FAC for ; Mon, 5 Jan 2015 14:04:11 +0100 (CET) Received: from pegasus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (pegasus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GBWs9sSZ0s0n for ; Mon, 5 Jan 2015 14:04:05 +0100 (CET) Received: from HTCATWO.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTP for ; Mon, 5 Jan 2015 14:04:05 +0100 (CET) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel --=-=-= Content-Type: text/plain Hi Guix, attached is a patch that adds a package recipe for CUPS. There are a couple of problems with this package, one of which is that the test suite is failing for some reason. I have not been able to figure out why the "cupsFileFind" test fails, so I disabled the tests. I'm also not sure if creating two outputs "out" and "include" is correct. To build OpenJDK with IcedTea I need to have both the library output and the include files and after splitting the outputs this worked fine. Finally, I have not actually tried to use CUPS at all, because I only really need the libs and headers to build OpenJDK. Best, Ricardo --=-=-= Content-Type: text/x-patch; charset="utf-8" Content-Disposition: attachment; filename="0001-gnu-Add-CUPS.patch" Content-Transfer-Encoding: quoted-printable >From 90ce3c9a1b1a7f3ba034b7e69aef910252470d72 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 5 Jan 2015 13:56:51 +0100 Subject: [PATCH] gnu: Add CUPS. * gnu/packages/cups.scm: New file * gnu-system.am (GNU_SYSTEM_MODULES): Add it --- gnu-system.am | 1 + gnu/packages/cups.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++= ++++++ 2 files changed, 68 insertions(+) create mode 100644 gnu/packages/cups.scm diff --git a/gnu-system.am b/gnu-system.am index efddb99..f3b1bf8 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -67,6 +67,7 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/cross-base.scm \ gnu/packages/crypto.scm \ gnu/packages/cryptsetup.scm \ + gnu/packages/cups.scm \ gnu/packages/curl.scm \ gnu/packages/cursynth.scm \ gnu/packages/cyrus-sasl.scm \ diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm new file mode 100644 index 0000000..f21d8bc --- /dev/null +++ b/gnu/packages/cups.scm @@ -0,0 +1,67 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2015 Ricardo Wurmus +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (a= t +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages cups) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages avahi) + #:use-module (gnu packages compression) + #:use-module (gnu packages gnutls) + #:use-module (gnu packages pkg-config)) + +(define-public cups + (package + (name "cups") + (version "2.0.1") + (source (origin + (method url-fetch) + (uri (string-append "http://www.cups.org/software/" + version "/cups-" version "-source.tar.= gz")) + (sha256 + (base32 + "1kbc85kwhm1vyzahblrg3qih9yypggs91d13gdrbnaac8q7jd9jr"))= )) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;cupsFileFind fails for some reason + #:phases + (alist-cons-before + 'configure + 'patch-makedefs + (lambda _ + (substitute* "Makedefs.in" + (("INITDIR.*=3D.*@INITDIR@") "INITDIR =3D @prefix@/@INITDIR@= ") + (("/bin/sh") (which "sh")))) + %standard-phases))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("avahi" ,avahi) + ("gnutls" ,gnutls) + ("zlib" ,zlib))) + (outputs '("out" "include")) + (home-page "http://www.cups.org") + (synopsis "CUPS printing system") + (description + "CUPS printing system provides a portable printing layer for UNIX=C2= =AE +operating systems. It has been developed by Apple Inc. to promote a sta= ndard +printing solution for all UNIX vendors and users. CUPS provides the Sys= tem V +and Berkeley command-line interfaces.") + (license license:gpl2+))) --=20 1.9.3 --=-=-=--