From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Snc-0008Eh-56 for guix-patches@gnu.org; Wed, 10 May 2017 10:41:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8SnW-0005dh-8m for guix-patches@gnu.org; Wed, 10 May 2017 10:41:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34186) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8SnW-0005db-51 for guix-patches@gnu.org; Wed, 10 May 2017 10:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d8SnV-0003Lv-Pm for guix-patches@gnu.org; Wed, 10 May 2017 10:41:01 -0400 Subject: bug#25928: [PATCH] gnu: Add darktable. Resent-Message-ID: References: <87zih4ee7i.fsf@gnu.org> <20170313232428.0530762b@alma-ubu> <20170314231326.3ac43a08@alma-ubu> <87fuhu52c8.fsf@elephly.net> <87tw4skdns.fsf@gnu.org> From: Ricardo Wurmus In-reply-to: <87tw4skdns.fsf@gnu.org> Date: Wed, 10 May 2017 16:40:24 +0200 Message-ID: <87k25ohj1j.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Roel Janssen Cc: 25928@debbugs.gnu.org Roel Janssen writes: > From 5053b44b621932d3c3aa0f1ddb8b01dd04cd4680 Mon Sep 17 00:00:00 2001 > From: Roel Janssen > Date: Wed, 10 May 2017 16:06:38 +0200 > Subject: [PATCH] gnu: Add darktable. > > * gnu/packages/photo.scm (darktable): New variable. > --- […] > + (arguments > + `(#:tests? #f ; There are no tests. > + #:configure-flags '("-DCMAKE_INSTALL_LIBDIR=lib") > + #:phases > + (modify-phases %standard-phases > + (add-before 'configure 'set-ldflags > + (lambda* (#:key outputs #:allow-other-keys) > + (setenv "LDFLAGS" > + (string-append > + "-Wl,-rpath=" > + (assoc-ref outputs "out") "/lib/darktable")) > + #t)) > + (add-after 'set-paths 'add-ilmbase-include-path > + (lambda* (#:key inputs #:allow-other-keys) > + ;; OpenEXR propagates ilmbase, but its include files do not appear > + ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to > + ;; the CPATH to satisfy the dependency on "ImathInt64.h". > + (setenv "CPATH" > + (string-append > + (assoc-ref inputs "ilmbase") > + "/include/OpenEXR:" (or (getenv "CPATH") ""))) > + #t))))) I wonder if it would be possible to augment LDFLAGS and CPATH in #:configure-flags or #:make-flags instead of using build phases (which I find a bit crude). If that’s too hard I promise I won’t complain about doing it with build phases :) > + (native-inputs > + `(("llvm" ,llvm-3.9.1) > + ("clang" ,clang-3.9.1))) > + (inputs > + `(("libxslt" ,libxslt) > + ("libxml2" ,libxml2) > + ("pugixml" ,pugixml) > + ("gtk+" ,gtk+) > + ("sqlite" ,sqlite) > + ("libjpeg" ,libjpeg) > + ("libpng" ,libpng) > + ("cairo" ,cairo) > + ("lcms" ,lcms) > + ("exiv2" ,exiv2) > + ("libtiff" ,libtiff) > + ("curl" ,curl) > + ("libgphoto2" ,libgphoto2) > + ("dbus-glib" ,dbus-glib) > + ("openexr" ,openexr) > + ("ilmbase" ,ilmbase) > + ("libsoup" ,libsoup) > + ("python-jsonschema" ,python-jsonschema) > + ("intltool" ,intltool) > + ("perl" ,perl) > + ("pkg-config" ,pkg-config) > + ("libwebp" ,libwebp) > + ("lensfun" ,lensfun) > + ("librsvg" ,librsvg) > + ("json-glib" ,json-glib) > + ("freeimage" ,freeimage))) > + (home-page "https://www.darktable.org") > + (synopsis "Virtual lighttable and darkroom for photographers") > + (description "Darktable is an open source photography workflow > application s/an open source/a/ > +and RAW developer. It manages your digital negatives in a database, lets you > +view them through a zoomable lighttable and enables you to develop raw images > +and enhance them.") > + (license license:gpl3+))) Good to push with the change to the description. Thanks! -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net