unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: Vinicius Monego <monego@posteo.net>
Cc: 42067-done@debbugs.gnu.org
Subject: bug#42067: [PATCH] gnu: darktable: Add optional dependencies.
Date: Mon, 29 Jun 2020 23:59:01 +0200	[thread overview]
Message-ID: <87eepxa5zu.fsf@gnu.org> (raw)
In-Reply-To: <20200626203904.16748-1-monego@posteo.net> (Vinicius Monego's message of "Fri, 26 Jun 2020 17:39:04 -0300")

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

Hi,

Vinicius Monego <monego@posteo.net> skribis:

> [arguments]: Fix opencl-c.h path.
> [native-inputs]: Add opencl-headers, make LLVM version specific.
> [inputs]: Add gmic.

I adjusted the commit log and applied the tiny change below.

>           (add-before 'configure 'prepare-build-environment
>             (lambda* (#:key inputs #:allow-other-keys)
> -             (setenv "CC" "clang") (setenv "CXX" "clang++")))
> +             (setenv "CC" "clang") (setenv "CXX" "clang++")

BTW, why are we building with Clang?

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 802 bytes --]

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 5b5e057b65..09767f464e 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -486,8 +486,9 @@ photographic equipment.")
              ;; Darktable looks for opencl-c.h in the LLVM dir. Guix installs
              ;; it to the Clang dir. We fix this by patching CMakeLists.txt.
              (substitute* "CMakeLists.txt"
-                          (("\\$\\{LLVM_INSTALL_PREFIX\\}")
-                           (assoc-ref %build-inputs "clang")))))
+               (("\\$\\{LLVM_INSTALL_PREFIX\\}")
+                (assoc-ref %build-inputs "clang")))
+             #t))
          (add-before 'configure 'set-LDFLAGS-and-CPATH
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (setenv "LDFLAGS"

  reply	other threads:[~2020-06-29 22:00 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-26 20:39 [bug#42067] [PATCH] gnu: darktable: Add optional dependencies Vinicius Monego
2020-06-29 21:59 ` Ludovic Courtès [this message]
2020-06-30  2:42   ` Vinicius Monego
2020-06-30 10:05     ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87eepxa5zu.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=42067-done@debbugs.gnu.org \
    --cc=monego@posteo.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).