diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-18 01:32:37 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-18 01:32:37 -0400 |
| commit | 2abf678682c42842c16e026c51d96b1fa86be88f (patch) | |
| tree | 7bd59bd08dbaf00f23f37a91d1e7ae3d7a915843 /gnu/packages/ocaml.scm | |
| parent | 9ae1e920718e95577c12de890754b6a6a4ff70a1 (diff) | |
| parent | c362a40a5825faafc76b72f69fb6595fa29d3f60 (diff) | |
| download | guix-2abf678682c42842c16e026c51d96b1fa86be88f.tar guix-2abf678682c42842c16e026c51d96b1fa86be88f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/ocaml.scm')
| -rw-r--r-- | gnu/packages/ocaml.scm | 7 |
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) |