diff options
| author | Greg Hogan <code@greghogan.com> | 2021-10-18 18:35:11 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-16 16:59:52 +0100 |
| commit | 963ebbc62c1b2eee49f5b00ecd5fb8e11dbbdced (patch) | |
| tree | c3e1793a22e35444ae915e45577ec05514fbddb0 | |
| parent | c769b8c2b5bf97cf9aaaa9b151012763355b1f66 (diff) | |
| download | guix-963ebbc62c1b2eee49f5b00ecd5fb8e11dbbdced.tar.gz | |
gnu: aws-c-event-stream: Replace patch.
* gnu/packages/c.scm (aws-c-event-stream): Replace patch. [arguments]: Fix CMAKE_PREFIX_PATH. [source]: Remove patch. * gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch: Delete file. * gnu/local.mk: Remove it. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/c.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch | 13 |
3 files changed, 5 insertions, 17 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8f57eba56a..5f035aae8e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -871,7 +871,6 @@ dist_patch_DATA = \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ - %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 3b10579ee7..34c87c2d4b 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -605,6 +605,7 @@ with fallback to efficient C99 software implementations.") (define-public aws-c-event-stream (package (name "aws-c-event-stream") + ; Update only when updating aws-crt-cpp. (version "0.2.7") (source (origin (method git-fetch) @@ -614,12 +615,13 @@ with fallback to efficient C99 software implementations.") (file-name (git-file-name name version)) (sha256 (base32 - "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh")) - (patches (search-patches "aws-c-event-stream-cmake-prefix.patch")))) + "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common"))))) (propagated-inputs `(("aws-c-common" ,aws-c-common) ("aws-c-io" ,aws-c-io) diff --git a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch b/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch deleted file mode 100644 index 79655a910b..0000000000 --- a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,10 @@ - cmake_minimum_required (VERSION 3.1) - project (aws-c-event-stream C) - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() |