diff options
| author | EuAndreh <eu@euandre.org> | 2024-11-20 11:05:58 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2024-11-20 11:05:58 -0300 |
| commit | 554ebae5172a14f5d6b5cca6840f8f1a5ec4e905 (patch) | |
| tree | 6cd3116aaf88bbf3a4b4bc4f065557a5e956e72e /src | |
| parent | papo.scm: Update "papo.im" (diff) | |
| download | packages-554ebae5172a14f5d6b5cca6840f8f1a5ec4e905.tar.gz packages-554ebae5172a14f5d6b5cca6840f8f1a5ec4e905.tar.xz | |
packages.scm: inherit logic from (pkg ...) in (gopkg ...)
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/euandre/packages.scm | 81 |
1 files changed, 38 insertions, 43 deletions
diff --git a/src/org/euandre/packages.scm b/src/org/euandre/packages.scm index d5598b5..35aaa65 100644 --- a/src/org/euandre/packages.scm +++ b/src/org/euandre/packages.scm @@ -176,7 +176,13 @@ (build-system gnu-build-system) (arguments (list - #:make-flags #~(list (string-append "PREFIX=" #$output)) + #:strip-binaries? #f + #:make-flags + #~(list + "-e" + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + (string-append "VERSION=" #$version)) #:phases #~(modify-phases %standard-phases (delete 'configure)))) @@ -283,48 +289,37 @@ l)) (define-public (gopkg name inputs version checksum) - (package - (inherit - (pkg - name - version - checksum)) - (arguments - (list - #:strip-binaries? #f - #:make-flags - #~(list - "-e" - (string-append "PREFIX=" #$output) - (string-append "VERSION=" #$version) - (string-append "CC=" #$(cc-for-target))) - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'setenv-golang - (lambda _ - (define (path->flags option) - (let ((search-path (getenv "GOLIBPACKPATH"))) - (string-join - (map (lambda (path) - (string-append option " " path)) - (if search-path - (string-split search-path #\:) - '())) - " "))) - (setenv "GOCFLAGS" (path->flags "-I")) - (setenv "GOLDFLAGS" (path->flags "-L"))))))) - (native-inputs - (append - (format-inputs - (list q:go-full)) - inputs)) - (native-search-paths - (list - (search-path-specification - (variable "GOLIBPACKPATH") - (files - (list "lib/go"))))))) + (let ((p (pkg name version checksum))) + (package + (inherit p) + (arguments + (substitute-keyword-arguments (package-arguments p) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'build 'setenv-golang + (lambda _ + (define (path->flags option) + (let ((search-path (getenv "GOLIBPACKPATH"))) + (string-join + (map (lambda (path) + (string-append option " " path)) + (if search-path + (string-split search-path #\:) + '())) + " "))) + (setenv "GOCFLAGS" (path->flags "-I")) + (setenv "GOLDFLAGS" (path->flags "-L")))))))) + (native-inputs + (append + (format-inputs + (list q:go-full)) + inputs)) + (native-search-paths + (list + (search-path-specification + (variable "GOLIBPACKPATH") + (files + (list "lib/go")))))))) (define-public guuid |