nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Adjust packages to new handling of propagated inputs. 

This is a followup to 161094c, which gets rid of the "a/b" notation for
propagated inputs.

* gnu/packages/cross-base.scm (cross-gcc-arguments): Change reference from
  "libc/linux-headers" to "linux-headers".
* gnu/packages/emacs.scm (magit-svn): Change "magit/git-modes" to
  "git-modes".
This commit is contained in:
Ludovic Courtès 2015-07-14 16:15:30 +02:00
parent 7e5124976b
commit c6d33a9d9c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/cross-base.scm
View File

@ -165,8 +165,7 @@ may be either a libc package or #f.)"
;; Add the cross Linux headers to CROSS_CPATH, and remove them ;; Add the cross Linux headers to CROSS_CPATH, and remove them
;; from CPATH. ;; from CPATH.
(let ((libc (assoc-ref inputs "libc")) (let ((libc (assoc-ref inputs "libc"))
(linux (assoc-ref inputs (linux (assoc-ref inputs "linux-headers")))
"libc/linux-headers")))
(define (cross? x) (define (cross? x)
;; Return #t if X is a cross-libc or cross Linux. ;; Return #t if X is a cross-libc or cross Linux.
(or (string-prefix? libc x) (or (string-prefix? libc x)
@ -314,7 +313,7 @@ XBINUTILS and the cross tool chain."
#t)) #t))
,phases)))) ,phases))))
;; Shadow the native "linux-headers" because glibc's recipe expect the ;; Shadow the native "linux-headers" because glibc's recipe expects the
;; "linux-headers" input to point to the right thing. ;; "linux-headers" input to point to the right thing.
(propagated-inputs `(("linux-headers" ,xlinux-headers))) (propagated-inputs `(("linux-headers" ,xlinux-headers)))

3
gnu/packages/emacs.scm
View File

@ -408,8 +408,7 @@ operations.")
"/bin/emacs")) "/bin/emacs"))
(magit (string-append (assoc-ref %build-inputs "magit") (magit (string-append (assoc-ref %build-inputs "magit")
"/share/emacs/site-lisp")) "/share/emacs/site-lisp"))
(commit (string-append (assoc-ref %build-inputs (commit (string-append (assoc-ref %build-inputs "git-modes")
"magit/git-modes")
"/share/emacs/site-lisp")) "/share/emacs/site-lisp"))
(source (assoc-ref %build-inputs "source")) (source (assoc-ref %build-inputs "source"))
(lisp-dir (string-append %output "/share/emacs/site-lisp"))) (lisp-dir (string-append %output "/share/emacs/site-lisp")))