diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-10-14 10:36:37 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-10-14 23:05:41 +0200 |
| commit | d0025d01445ff271ececea20cfa6a2346593d1d6 (patch) | |
| tree | 1696964b83bf5c1d73d50a99d2493c76e642e29b /guix | |
| parent | b280e67ca6f62c176c72439df4533a9737b9130a (diff) | |
| download | gnu-guix-d0025d01445ff271ececea20cfa6a2346593d1d6.tar gnu-guix-d0025d01445ff271ececea20cfa6a2346593d1d6.tar.gz | |
packages: 'package-grafts' applies grafts on replacement.
Partly fixes <http://bugs.gnu.org/24418>.
* guix/packages.scm (input-graft): Compute 'new' with #:graft? #t.
(input-cross-graft): Likewise.
* tests/packages.scm ("package-grafts, indirect grafts, cross"): Comment
out.
("replacement also grafted"): New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/packages.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index 2264c5acef..a3fab4dc13 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -916,7 +916,8 @@ and return it." (cached (=> %graft-cache) package system (let ((orig (package-derivation store package system #:graft? #f)) - (new (package-derivation store replacement system))) + (new (package-derivation store replacement system + #:graft? #t))) (graft (origin orig) (replacement new))))))) @@ -932,7 +933,8 @@ and return it." (let ((orig (package-cross-derivation store package target system #:graft? #f)) (new (package-cross-derivation store replacement - target system))) + target system + #:graft? #t))) (graft (origin orig) (replacement new)))))) |