diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-17 19:18:04 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-22 22:12:33 +0100 |
| commit | ff5733d186839f32d1558a9e1f049d218613fa1a (patch) | |
| tree | 98e2f53fa29c3454a48396ab2161217571f4e3fc /gnu/packages/image.scm | |
| parent | 26edcd9b8db553bed324149bc039c306a804a2a3 (diff) | |
| download | guix-patches-ff5733d186839f32d1558a9e1f049d218613fa1a.tar guix-patches-ff5733d186839f32d1558a9e1f049d218613fa1a.tar.gz | |
gnu: libjpeg-turbo: Build with a minimal variant of CMake.
This is necessary to avoid a circular dependency in the next commit.
* gnu/packages/curl.scm (curl-minimal): New public variable.
* gnu/packages/cmake.scm (cmake-minimal-bootstrap): New public variable.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add #:cmake.
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 709599fb98..4fef6fe21e 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages curl) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) @@ -1504,8 +1505,13 @@ is hereby granted.")))) (native-inputs `(("nasm" ,nasm))) (arguments - '(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib" - "-DENABLE_STATIC=0"))) + `(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib" + "-DENABLE_STATIC=0") + ,@(if (%current-target-system) + '() + ;; Use a special "bootstrap" CMake for the native build to work + ;; around a circular dependency between CMake and this package. + `(#:cmake ,cmake-minimal-bootstrap)))) (home-page "https://libjpeg-turbo.org/") (synopsis "SIMD-accelerated JPEG image handling library") (description "libjpeg-turbo is a JPEG image codec that accelerates baseline |