[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: packages: 'package-with-patches' preserves package location.
From: |
guix-commits |
Subject: |
01/03: packages: 'package-with-patches' preserves package location. |
Date: |
Wed, 28 Apr 2021 19:22:29 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 0ce1b281511bd1a9505f416ec7ff1be3c3d7a243
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Apr 28 15:26:58 2021 +0200
packages: 'package-with-patches' preserves package location.
* guix/packages.scm (package-with-patches): Preserve the 'location'
field of ORIGINAL.
---
guix/packages.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 55e5e70..c825f42 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic
Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
@@ -790,7 +790,8 @@ specifies modules in scope when evaluating SNIPPET."
"Return package ORIGINAL with PATCHES applied."
(package (inherit original)
(source (origin (inherit (package-source original))
- (patches patches)))))
+ (patches patches)))
+ (location (package-location original))))
(define (package-with-extra-patches original patches)
"Return package ORIGINAL with all PATCHES appended to its list of patches."