From 2f6d3e417fb99d264f0147a81771874860dcaf10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2015 09:13:04 +0200 Subject: [PATCH] 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 file 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)