diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
| commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
| tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/compilers/hop | |
| parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
| parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
| download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip | |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/hop')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/hop/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/compilers/hop/default.nix b/nixpkgs/pkgs/development/compilers/hop/default.nix index f63f4169bc36..fd3ef137ae60 100644 --- a/nixpkgs/pkgs/development/compilers/hop/default.nix +++ b/nixpkgs/pkgs/development/compilers/hop/default.nix @@ -1,21 +1,27 @@ { 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"; }; - buildInputs = [ bigloo ]; - - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lbigloogc-4.1a"; + postPatch = '' + substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")' ''; + buildInputs = [ bigloo ]; + configureFlags = [ "--bigloo=${bigloo}/bin/bigloo" - "--bigloolibdir=${bigloo}/lib/bigloo/4.1a/" + "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/" ]; meta = with stdenv.lib; { |