aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-17 09:13:04 +0200
committerLudovic Courtès <ludo@gnu.org>2015-06-18 00:25:48 +0200
commit2f6d3e417fb99d264f0147a81771874860dcaf10 (patch)
treede7405e6953d503336656ad16a8430d5510cbaa5 /gnu/packages
parentba981db2933e47d20e22098ef1bc93db3461cebc (diff)
downloadguix-2f6d3e417fb99d264f0147a81771874860dcaf10.tar
guix-2f6d3e417fb99d264f0147a81771874860dcaf10.tar.gz
gnu: ocaml: Don't rely on (gnu packages commencement).
* gnu/packages/ocaml.scm (ocaml)[inputs]: Use (canonical-package gcc-4.8) instead of GCC-FINAL.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/ocaml.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5baf24cac0..84841d017c 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -24,12 +24,12 @@
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages base)
#:use-module (gnu packages emacs)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages compression)
- #:use-module (gnu packages commencement)
#:use-module (gnu packages xorg)
#:use-module (gnu packages texlive)
#:use-module (gnu packages perl)
@@ -57,8 +57,9 @@
("pkg-config" ,pkg-config)))
(inputs
`(("libx11" ,libx11)
- ("gcc:lib" ,gcc-final "lib") ; for libiberty, needed for objdump support
- ("zlib" ,zlib))) ; also needed for objdump support
+ ;; For libiberty, needed for objdump support.
+ ("gcc:lib" ,(canonical-package gcc-4.8) "lib")
+ ("zlib" ,zlib))) ;also needed for objdump support
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)