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/curl.scm | |
| parent | 26edcd9b8db553bed324149bc039c306a804a2a3 (diff) | |
| download | guix-ff5733d186839f32d1558a9e1f049d218613fa1a.tar guix-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/curl.scm')
| -rw-r--r-- | gnu/packages/curl.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b06d01c7d7..9289e2ffd3 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -46,7 +46,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (srfi srfi-1)) (define-public curl (package @@ -159,6 +160,15 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) +;; This package exists mainly to bootstrap CMake. It must not depend on +;; anything that uses cmake-build-system. +(define-public curl-minimal + (hidden-package + (package/inherit + curl + (name "curl-minimal") + (inputs (alist-delete "openldap" (package-inputs curl)))))) + (define-public kurly (package (name "kurly") |