From ff5733d186839f32d1558a9e1f049d218613fa1a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Jan 2020 19:18:04 +0100 Subject: 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. --- gnu/packages/curl.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/curl.scm') 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") -- cgit 1.4.1