me/guix
Archived
1
0
Fork 0
Code Activity

snix: Adjust import to current Nixpkgs input attribute names.

Browse source 
* guix/snix.scm (snix-derivation->guix-package): Use the new names
  `nativeBuildInputs' and `propagatedNativeBuildInputs'.
This commit is contained in:
Ludovic Courtès 2013-03-28 15:30:27 +01:00
parent f9bbf2a819
commit 3f5a932eea
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
guix/snix.scm
View file

@ -277,7 +277,7 @@ ATTRIBUTE is true, only that attribute is considered."
%nix-instantiate "--strict" "--eval-only" "--xml" %nix-instantiate "--strict" "--eval-only" "--xml"
;; Pass a dummy `crossSystem' argument so that `buildInputs' and ;; Pass a dummy `crossSystem' argument so that `buildInputs' and
;; `buildNativeInputs' are not coalesced. ;; `nativeBuildInputs' are not coalesced.
;; XXX: This is hacky and has other problems. ;; XXX: This is hacky and has other problems.
;"--arg" "crossSystem" cross-system ;"--arg" "crossSystem" cross-system
@ -423,12 +423,15 @@ location of DERIVATION."
(build-system gnu-build-system) (build-system gnu-build-system)
;; When doing a native Nixpkgs build, `buildInputs' is empty and ;; When doing a native Nixpkgs build, `buildInputs' is empty and
;; everything is in `buildNativeInputs'. So we can't distinguish ;; everything is in `nativeBuildInputs'. So we can't distinguish
;; between both, here. ;; between both, here.
;;
;; Note that `nativeBuildInputs' was renamed from
;; `buildNativeInputs' in Nixpkgs sometime around March 2013.
,@(maybe-inputs 'inputs ,@(maybe-inputs 'inputs
(convert-inputs "buildNativeInputs")) (convert-inputs "nativeBuildInputs"))
,@(maybe-inputs 'propagated-inputs ,@(maybe-inputs 'propagated-inputs
(convert-inputs "propagatedBuildNativeInputs")) (convert-inputs "propagatedNativeBuildInputs"))
(home-page ,(and=> (find-attribute-by-name "homepage" meta) (home-page ,(and=> (find-attribute-by-name "homepage" meta)
attribute-value)) attribute-value))