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

packages: Remove 'self-native-input?' field. 

This field has become unnecessary with the addition of 'this-package'.

* guix/packages.scm (<package>)[self-native-input?]: Remove.
(package->bag): Adjust accordingly.
* doc/guix.texi (package Reference): Remove 'self-native-input?'.
This commit is contained in:
Ludovic Courtès 2019-03-30 14:59:26 +01:00
parent 329c3c323e
commit a7646bc5e1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -5361,10 +5361,6 @@ more. To ensure that libraries written in those languages can find
library code they depend on at run time, run-time dependencies must be library code they depend on at run time, run-time dependencies must be
listed in @code{propagated-inputs} rather than @code{inputs}. listed in @code{propagated-inputs} rather than @code{inputs}.
@item @code{self-native-input?} (default: @code{#f})
This is a Boolean field telling whether the package should use itself as
a native input when cross-compiling.
@item @code{outputs} (default: @code{'("out")}) @item @code{outputs} (default: @code{'("out")})
The list of output names of the package. @xref{Packages with Multiple The list of output names of the package. @xref{Packages with Multiple
Outputs}, for typical uses of additional outputs. Outputs}, for typical uses of additional outputs.

11
guix/packages.scm
View File

@ -264,9 +264,6 @@ name of its URI."
(default '()) (thunked)) (default '()) (thunked))
(native-inputs package-native-inputs ; native input packages/derivations (native-inputs package-native-inputs ; native input packages/derivations
(default '()) (thunked)) (default '()) (thunked))
(self-native-input? package-self-native-input? ; whether to use itself as
; a native input when cross-
(default #f)) ; compiling
(outputs package-outputs ; list of strings (outputs package-outputs ; list of strings
(default '("out"))) (default '("out")))
@ -1032,7 +1029,7 @@ and return it."
((and self ((and self
($ <package> name version source build-system ($ <package> name version source build-system
args inputs propagated-inputs native-inputs args inputs propagated-inputs native-inputs
self-native-input? outputs)) outputs))
;; Even though we prefer to use "@" to separate the package ;; Even though we prefer to use "@" to separate the package
;; name from the package version in various user-facing parts ;; name from the package version in various user-facing parts
;; of Guix, checkStoreName (in nix/libstore/store-api.cc) ;; of Guix, checkStoreName (in nix/libstore/store-api.cc)
@ -1044,11 +1041,7 @@ and return it."
#:inputs (append (inputs self) #:inputs (append (inputs self)
(propagated-inputs self)) (propagated-inputs self))
#:outputs outputs #:outputs outputs
#:native-inputs `(,@(if (and target #:native-inputs (native-inputs self)
self-native-input?)
`(("self" ,self))
'())
,@(native-inputs self))
#:arguments (args self)) #:arguments (args self))
(raise (if target (raise (if target
(condition (condition