diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/rrdtool.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
| download | guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar.gz guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.zip | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/rrdtool.scm')
| -rw-r--r-- | gnu/packages/rrdtool.scm | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gnu/packages/rrdtool.scm b/gnu/packages/rrdtool.scm index 13419e4d37..1fb642216d 100644 --- a/gnu/packages/rrdtool.scm +++ b/gnu/packages/rrdtool.scm @@ -53,17 +53,17 @@ ("gtk" ,gtk+-2) ("libxml2" ,libxml2) ("pango" ,pango) - ("python" ,python-2))) + ("python" ,python))) (native-inputs - `(("groff" ,groff) - ("pkg-config" ,pkg-config) - - ;; For tests. - ("bc" ,bc) - ("perl" ,perl) ; will also build Perl bindings - ("tzdata" ,tzdata-for-tests))) + (list groff + pkg-config + ;; For tests. + bc + perl ; will also build Perl bindings + tzdata-for-tests)) (arguments - '(#:phases + `(#:disallowed-references (,tzdata-for-tests) + #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda _ @@ -73,9 +73,7 @@ (add-before 'check 'prepare-test-environment (lambda* (#:key inputs #:allow-other-keys) (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - #t)) + (search-input-directory inputs "share/zoneinfo")))) (add-after 'install 'remove-native-input-references (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |