diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-07 08:57:37 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-07 09:26:01 -0500 |
| commit | 234190df00ae8032db38c7a4e2c82d7d8f364990 (patch) | |
| tree | 705744c8a8b7ef24cb36418bcd3008441c0f10e0 | |
| parent | 1e05b4a7fd862f7abafb745d52d89e0f20f0c1ba (diff) | |
| download | guix-234190df00ae8032db38c7a4e2c82d7d8f364990.tar guix-234190df00ae8032db38c7a4e2c82d7d8f364990.tar.gz | |
gnu: linux: customize-linux: Remove input labels.
* gnu/packages/linux.scm (make-linux-libre-source) [native-inputs]: Delete
field, using the defconfig gexp directly...
[phases] <configure>: ... here.
| -rw-r--r-- | gnu/packages/linux.scm | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8d86ec67e1..5ae9d82530 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -262,10 +262,10 @@ of 'uname -r' behind the Linux version numbers." #$(and extra-version (not (string-null? extra-version)) (string-append "-" extra-version))) - (let* ((configs - (string-append "arch/" #$(linux-srcarch) "/configs/")) - (guix_defconfig - (string-append configs "guix_defconfig"))) + (let* ((configs (string-append "arch/" #$(linux-srcarch) + "/configs/")) + (guix_defconfig (string-append configs + "guix_defconfig"))) #$(cond ((not defconfig) #~(begin @@ -282,19 +282,11 @@ of 'uname -r' behind the Linux version numbers." guix_defconfig)) (else ;; Copy the defconfig input to the proper location. - #~(copy-file (assoc-ref inputs "guix_defconfig") - guix_defconfig))) + #~(copy-file #$defconfig guix_defconfig))) (chmod guix_defconfig #o644) (modify-defconfig guix_defconfig '#$configs) (invoke "make" "guix_defconfig") - (verify-config ".config" guix_defconfig)))))))) - (native-inputs - (append (if (or (not defconfig) - (string? defconfig)) - '() - ;; The defconfig should be an origin or file-like object. - `(("guix_defconfig" ,defconfig))) - (package-native-inputs linux))))) + (verify-config ".config" guix_defconfig)))))))))) (define (make-defconfig uri sha256-as-base32) (origin (method url-fetch) |