From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45105)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dgdIM-0007sY-MU
	for guix-patches@gnu.org; Sat, 12 Aug 2017 16:46:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dgdII-0003lq-Ja
	for guix-patches@gnu.org; Sat, 12 Aug 2017 16:46:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:49467)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1dgdII-0003li-GP
	for guix-patches@gnu.org; Sat, 12 Aug 2017 16:46:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dgdII-0006i2-AF
	for guix-patches@gnu.org; Sat, 12 Aug 2017 16:46:02 -0400
Subject: [bug#27992] [PATCH] gnu: Add ogre.
In-Reply-To: <20170806194810.26105-1-manolis837@gmail.com>
Resent-Message-ID: <handler.27992.B27992.150257070925782@debbugs.gnu.org>
From: Alex Kost <alezost@gmail.com>
References: <20170806194810.26105-1-manolis837@gmail.com>
Date: Sat, 12 Aug 2017 23:44:58 +0300
Message-ID: <87bmnkldmd.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: manolis837@gmail.com
Cc: 27992@debbugs.gnu.org

manolis837@gmail.com (2017-08-06 22:48 +0300) wrote:

[...]
> +(define-public ogre
> +  (package
> +    (name "ogre")
> +    (version "1.10.7")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/OGRECave/" name
> +                           "/archive/v" version ".tar.gz"))

Please add 'file-name' to avoid "/gnu/store/=E2=80=A6-v1.10.7.tar.gz" name:

          (file-name (string-append name "-" version ".tar.gz"))

This is reported by "guix lint ogre".

> +       (sha256
> +        (base32
> +         "1ab354bmwwryxr4zgxchfkm6h4z38mjgif8yn89x640rsrgw5ipj"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'pre-configure
> +           (lambda* (#:key inputs #:allow-other-keys)

'inputs' are not used here, so just: (lambda _ ...)

> +             ;; It expects googletest source to be downloaded and
> +             ;; be in a specific place.
> +             (substitute* "Tests/CMakeLists.txt"
> +               (("URL(.*)$" _ suffix) (string-append "URL " suffix
> +"\t\tURL_HASH MD5=3D16877098823401d1bf2ed7891d7dce36\n")))

This string shouldn't start from the beginning of the line.  I see the
problem is that a properly indented line would be too long.  I would
write it like this:

             (substitute* "Tests/CMakeLists.txt"
               (("URL(.*)$" _ suffix)
                (string-append "URL " suffix
                               "\t\tURL_HASH "
                               "MD5=3D16877098823401d1bf2ed7891d7dce36\n")))

> +             #t))
> +         (add-before 'build 'pre-build
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (copy-file (assoc-ref inputs "googletest-source")
> +              (string-append (getcwd)
> +               "/Tests/googletest-prefix/src/release-1.8.0.tar.gz"))
                  ^^^^
same here: (string-append ...) and the next line are not indented
properly.  I would write:

             (copy-file (assoc-ref inputs "googletest-source")
                        (string-append (getcwd)
                                       "/Tests/googletest-prefix/src"
                                       "/release-1.8.0.tar.gz"))

The rest looks good to me, thanks!

--=20
Alex