From patchwork Mon Jun 29 21:59:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 22970 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7F36C27BBE3; Mon, 29 Jun 2020 23:00:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 35DC327BBE1 for ; Mon, 29 Jun 2020 23:00:20 +0100 (BST) Received: from localhost ([::1]:38012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq1p5-00069y-M7 for patchwork@mira.cbaines.net; Mon, 29 Jun 2020 18:00:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1op-000695-2a for guix-patches@gnu.org; Mon, 29 Jun 2020 18:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38127) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1oo-0001A8-LO for guix-patches@gnu.org; Mon, 29 Jun 2020 18:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jq1oo-0001kX-J7 for guix-patches@gnu.org; Mon, 29 Jun 2020 18:00:02 -0400 Subject: bug#42067: [PATCH] gnu: darktable: Add optional dependencies. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 22:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 42067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vinicius Monego Cc: 42067-done@debbugs.gnu.org Mail-Followup-To: 42067@debbugs.gnu.org, ludo@gnu.org, monego@posteo.net Received: via spool by 42067-done@debbugs.gnu.org id=D42067.15934679536582 (code D ref 42067); Mon, 29 Jun 2020 22:00:02 +0000 Received: (at 42067-done) by debbugs.gnu.org; 29 Jun 2020 21:59:13 +0000 Received: from localhost ([127.0.0.1]:49672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq1o1-0001i5-30 for submit@debbugs.gnu.org; Mon, 29 Jun 2020 17:59:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq1nz-0001ht-1j for 42067-done@debbugs.gnu.org; Mon, 29 Jun 2020 17:59:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39482) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq1ns-00015l-Po; Mon, 29 Jun 2020 17:59:04 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48334 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jq1nr-0001OQ-L1; Mon, 29 Jun 2020 17:59:04 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20200626203904.16748-1-monego@posteo.net> Date: Mon, 29 Jun 2020 23:59:01 +0200 In-Reply-To: <20200626203904.16748-1-monego@posteo.net> (Vinicius Monego's message of "Fri, 26 Jun 2020 17:39:04 -0300") Message-ID: <87eepxa5zu.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, Vinicius Monego 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’. 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"