diff options
| author | Efraim Flashner | 2019-12-29 04:05:17 -0600 |
|---|---|---|
| committer | Efraim Flashner | 2019-12-29 04:05:17 -0600 |
| commit | 16ef26bbf0917a101c025702e3cf861e51ebff29 (patch) | |
| tree | e39b720bba4b3d3b3316db16f1bcdb44083613fc | |
| parent | 8e0c325a7cb44943448862ad26ebcbc2da09e55e (diff) | |
| download | guix-bioinformatics-16ef26bbf0917a101c025702e3cf861e51ebff29.tar.gz | |
gn: kubernetes: Patch reference to mount
| -rw-r--r-- | gn/packages/kubernetes.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gn/packages/kubernetes.scm b/gn/packages/kubernetes.scm index 01cde49..208cab4 100644 --- a/gn/packages/kubernetes.scm +++ b/gn/packages/kubernetes.scm @@ -8,6 +8,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages linux) #:use-module (gnu packages rsync)) (define-public kubernetes @@ -35,12 +36,18 @@ (for-each make-file-writable (find-files ".")) #t)) (add-before 'build 'prepare-build - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "src/k8s.io/kubernetes" (substitute* '("build/root/Makefile" "build/root/Makefile.generated_files" "build/pause/Makefile") - (("/bin/bash") (which "bash")))) + (("/bin/bash") (which "bash"))) + (substitute* "pkg/util/mount/mount.go" + (("defaultMountCommand.*") + (string-append "defaultMountCommand = \"" + (assoc-ref inputs "util-linux") + "/bin/mount\"\n"))) + ) #t)) (replace 'build (lambda _ @@ -87,7 +94,8 @@ (native-inputs `(("which" ,which))) (inputs - `(("rsync" ,rsync))) + `(("rsync" ,rsync) + ("util-linux" ,util-linux))) (propagated-inputs `(("crictl" ,crictl))) ; Must be the same major+minor version as kubernetes. (home-page "https://kubernetes.io/") |