From mboxrd@z Thu Jan 1 00:00:00 1970 From: Axel Subject: Re: [PATCH] gnu: Add xcape. Date: Tue, 17 Mar 2015 01:19:36 +0300 Message-ID: References: <871tkpat8x.fsf@mango.localdomain> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=047d7bb03ea804e52405116f40bd Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXdMd-0002oH-7B for guix-devel@gnu.org; Mon, 16 Mar 2015 18:20:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXdMc-00047r-4h for guix-devel@gnu.org; Mon, 16 Mar 2015 18:19:59 -0400 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:38481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXdMb-00047d-Ra for guix-devel@gnu.org; Mon, 16 Mar 2015 18:19:58 -0400 Received: by wifj2 with SMTP id j2so55705757wif.1 for ; Mon, 16 Mar 2015 15:19:56 -0700 (PDT) In-Reply-To: <871tkpat8x.fsf@mango.localdomain> 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 --047d7bb03ea804e52405116f40bd Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable David and Ricardo, thank for a review! I followed your advices and prepared new patch. 2015-03-16 17:53 GMT+03:00 Ricardo Wurmus : > >> From 0ad9b0eea2cd6151072d27f5e2505db9db083b37 Mon Sep 17 00:00:00 2001 >> From: "Alexander I.Grafov (Axel)" >> Date: Sun, 15 Mar 2015 20:01:03 +0300 >> Subject: [PATCH] gnu: Add xcape. >> >> * gnu/packages/xdisorg.scm (xcape): New variable. >> --- >> + >> +(define-public xcape >> + (package >> + (name "xcape") >> + (version "1.1") >> + (source >> + (origin >> + (method url-fetch) >> + (uri (string-append >> + "https://github.com/alols/" >> + name >> + "/archive/v" >> + version >> + ".tar.gz")) > > As the tarball does not include the name of the package you should > probably add something like this: > > (file-name (string-append name "-" version ".tar.gz")) > >> + (arguments >> + `(#:tests? #f ; no test target >> + #:phases (alist-replace >> + 'configure >> + (let ((out (assoc-ref %outputs "out"))) >> + (lambda _ >> + (substitute* "Makefile" >> + (("(PREFIX[[:blank:]]*=3D.*)") >> + (string-append "CC:=3Dgcc\nPREFIX=3D" out "\n")= ) >> + (("(MANDIR.*=3D.*)") >> + (string-append "MANDIR=3D/share/man/man1\n"))))= ) > > Is this really necessary or could you just set these variables as > make-flags? > > #:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outputs "ou= t")) > "CC=3Dgcc" > ...) > > ~~ Ricardo --=20 =D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80 =D0=93=D1=80=D0=B0= =D1=84=D0=BE=D0=B2 --047d7bb03ea804e52405116f40bd Content-Type: application/octet-stream; name="0001-gnu-Add-xcape.patch" Content-Disposition: attachment; filename="0001-gnu-Add-xcape.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i7cfnalg0 RnJvbSA1MTE0OTRlM2E2MGI3YWQwNTVhYmFkNGViYjEwNDViZTc3MDg1YWFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiQWxleGFuZGVyIEkuR3JhZm92IChBeGVsKSIgPGdyYWZvdkBn bWFpbC5jb20+CkRhdGU6IFR1ZSwgMTcgTWFyIDIwMTUgMDE6MTQ6MTYgKzAzMDAKU3ViamVjdDog W1BBVENIXSBnbnU6IEFkZCB4Y2FwZS4KCiogZ251L3BhY2thZ2VzL3hkaXNvcmcuc2NtICh4Y2Fw ZSk6IE5ldyB2YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMveGRpc29yZy5zY20gfCAzMiArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDMyIGluc2VydGlv bnMoKykKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMveGRpc29yZy5zY20gYi9nbnUvcGFja2Fn ZXMveGRpc29yZy5zY20KaW5kZXggZmJmMWJiZi4uM2RiOWQyMiAxMDA2NDQKLS0tIGEvZ251L3Bh Y2thZ2VzL3hkaXNvcmcuc2NtCisrKyBiL2dudS9wYWNrYWdlcy94ZGlzb3JnLnNjbQpAQCAtNDg2 LDMgKzQ4NiwzNSBAQCB1bmljb2RlLCBYRlQgYW5kIG1heSBiZSBleHRlbmRlZCB3aXRoIFBlcmwg cGx1Z2lucy4gIEl0IGFsc28gY29tZXMgd2l0aCBhCiBjbGllbnQvZGFlbW9uIHBhaXIgdGhhdCBs ZXRzIHlvdSBvcGVuIGFueSBudW1iZXIgb2YgdGVybWluYWwgd2luZG93cyBmcm9tCiB3aXRoaW4g YSBzaW5nbGUgcHJvY2Vzcy4iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMyspKSkKKworKGRl ZmluZS1wdWJsaWMgeGNhcGUKKyAgKHBhY2thZ2UKKyAgICAobmFtZSAieGNhcGUiKQorICAgICh2 ZXJzaW9uICIxLjEiKQorICAgIChzb3VyY2UKKyAgICAgIChvcmlnaW4KKyAgICAgICAgKG1ldGhv ZCB1cmwtZmV0Y2gpCisgICAgICAgICh1cmkgKHN0cmluZy1hcHBlbmQKKyAgICAgICAgICAgICAg Imh0dHBzOi8vZ2l0aHViLmNvbS9hbG9scy8iIG5hbWUgIi9hcmNoaXZlL3YiIHZlcnNpb24gIi50 YXIuZ3oiKSkKKyAgICAgICAgKGZpbGUtbmFtZSAoc3RyaW5nLWFwcGVuZCBuYW1lICItIiB2ZXJz aW9uICIudGFyLmd6IikpCisgICAgICAgIChzaGEyNTYKKyAgICAgICAgICAoYmFzZTMyCisgICAg ICAgICAgICAiMGprZGlheGM2c3J5cmJpYmRnaTJ5MWM0OG40bDl4eWF6aHhyMTZsNmg0aWJkZHg5 NWJrOSIpKSkpCisgICAgKGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQorICAgIChhcmd1 bWVudHMKKyAgICAgYCgjOnRlc3RzPyAjZgorICAgICAgICM6cGhhc2VzIChhbGlzdC1kZWxldGUg J2NvbmZpZ3VyZSAlc3RhbmRhcmQtcGhhc2VzKQorICAgICAgICM6bWFrZS1mbGFncyAobGlzdCAo c3RyaW5nLWFwcGVuZCAiUFJFRklYPSIgKGFzc29jLXJlZiAlb3V0cHV0cyAib3V0IikpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICJNQU5ESVI9L3NoYXJlL21hbi9tYW4xIiAiQ0M9Z2NjIikp KQorICAgIChpbnB1dHMKKyAgICAgYCgoImxpYnh0c3QiICxsaWJ4dHN0KQorICAgICAgICgibGli eDExIiAsbGlieDExKSkpCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoInBrZy1jb25maWci ICxwa2ctY29uZmlnKSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cDovL2dpdGh1Yi5jb20vYWxvbHMv eGNhcGUiKQorICAgIChzeW5vcHNpcyAiVXNlIGEgbW9kaWZpZXIga2V5IGluIFgub3JnIGFzIGFu b3RoZXIga2V5IikKKyAgICAoZGVzY3JpcHRpb24KKyAgICAgIlRoaXMgdXRpbGl0eSBmb3IgWC5v cmcgYWxsb3dzIHRvIHVzZSBtb2RpZmllciBrZXkgYXMgYW5vdGhlciBrZXkgd2hlbgorcHJlc3Nl ZCBhbmQgcmVsZWFzZWQgb24gaXRzIG93bi4gIFRoZSBkZWZhdWx0IGJlaGF2aW91ciBpcyB0byBn ZW5lcmF0ZQordGhlIEVzY2FwZSBrZXkgd2hlbiBMZWZ0IENvbnRyb2wgaXMgcHJlc3NlZCBhbmQg cmVsZWFzZWQgb24gaXRzIG93bi4iKQorICAgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMyspKSkKLS0g CjIuMi4xCgo= --047d7bb03ea804e52405116f40bd--