[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: ocaml: Don't rely on (gnu packages commencement).
From: |
Ludovic Courtès |
Subject: |
01/05: gnu: ocaml: Don't rely on (gnu packages commencement). |
Date: |
Wed, 17 Jun 2015 22:36:23 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 2f6d3e417fb99d264f0147a81771874860dcaf10
Author: Ludovic Courtès <address@hidden>
Date: Wed Jun 17 09:13:04 2015 +0200
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.
---
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 5baf24c..84841d0 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)