diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 32116048a43..a3bac2b1722 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,17 +1,29 @@ -{ fetchurl, stdenv, gmp }: +{ fetchurl, stdenv, autoconf, automake, libtool, gmp +, darwin +}: stdenv.mkDerivation rec { pname = "bigloo"; - version = "4.1a-2"; + version = "4.3h"; src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo${version}.tar.gz"; - sha256 = "09yrz8r0jpj7bda39fdxzrrdyhi851nlfajsyf0b6jxanz6ygcjx"; + url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz"; + sha256 = "0fw08096sf8ma2cncipnidnysxii0h0pc7kcqkjhkhdchknp8vig"; }; + nativeBuildInputs = [ autoconf automake libtool ]; + + buildInputs = stdenv.lib.optional stdenv.isDarwin + darwin.apple_sdk.frameworks.ApplicationServices + ; + propagatedBuildInputs = [ gmp ]; preConfigure = + # For libuv on darwin + stdenv.lib.optionalString stdenv.isDarwin '' + export LIBTOOLIZE=libtoolize + '' + # Help libgc's configure. '' export CXXCPP="$CXX -E" ''; diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix index 49687cfb2d8..fd3ef137ae6 100644 --- a/pkgs/development/compilers/hop/default.nix +++ b/pkgs/development/compilers/hop/default.nix @@ -1,10 +1,16 @@ { stdenv, fetchurl, bigloo }: +# Compute the “release” version of bigloo (before the first dash, if any) +let bigloo-release = + let inherit (stdenv.lib) head splitString; in + head (splitString "-" (builtins.parseDrvName bigloo.name).version) +; in + stdenv.mkDerivation rec { - name = "hop-2.5.1"; + name = "hop-3.3.0"; src = fetchurl { url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/${name}.tar.gz"; - sha256 = "1bvp7pc71bln5yvfj87s8750c6l53wjl6f8m12v62q9926adhwys"; + sha256 = "14gf9ihmw95zdnxsqhn5jymfivpfq5cg9v0y7yjd5i7c787dncp5"; }; postPatch = '' @@ -13,13 +19,9 @@ stdenv.mkDerivation rec { buildInputs = [ bigloo ]; - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lbigloogc-4.1a"; - ''; - configureFlags = [ "--bigloo=${bigloo}/bin/bigloo" - "--bigloolibdir=${bigloo}/lib/bigloo/4.1a/" + "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/" ]; meta = with stdenv.lib; {