diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-10 13:07:21 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-10 13:07:21 +0100 |
| commit | 287144e34258f353425ba78817439df1f2c9e80d (patch) | |
| tree | ec96c46c08855adc24b3664395b20974bd6923ea /pkgs/development/interpreters | |
| parent | 528664e3bb33bae66d4ce41877fe573395010dd9 (diff) | |
| parent | e0fd84cf439f39d31e2c317b228b0c035cc6211d (diff) | |
| download | nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.gz nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.bz2 nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.lz nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.xz nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.zst nixlib-287144e34258f353425ba78817439df1f2c9e80d.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/gtk-server/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/metamath/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pure/default.nix | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index ab295dab4443..6f5a5ec0f198 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { configureOptions = [ "--with-gtk2" ]; + NIX_LDFLAGS = [ + "-ldl" + ]; + meta = { description = "gtk-server for interpreted GUI programming"; homepage = http://www.gtk-server.org/; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 2fb1ccb24bc4..fedb9f59f80f 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "metamath-${version}"; - version = "0.168"; + version = "0.171"; buildInputs = [ autoreconfHook ]; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Taneb"; repo = "metamath"; - rev = "542bfd5e53d8ce026ce5d29da9e7069ec807f5e0"; - sha256 = "07ssgqh9ipiw1bf60snmjaxngln1an1h9q0vgszadc94wzw06zi4"; + rev = "1c622a844fbdee43f13a629c73d8b33ff7fc4e44"; + sha256 = "0bkz75saddlwinyqwmxx89nilaar401j63kgqfqiak8iw2nk3wln"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index c2b120576ea2..188058a73b52 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex makeWrapper ]; propagatedBuildInputs = [ llvm gmp mpfr readline ]; + NIX_LDFLAGS = [ "-lLLVMJIT" ]; postPatch = '' for f in expr.cc matcher.cc printer.cc symtable.cc parserdefs.hh; do |