public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson
2018-05-10 13:29:04 -04:00
parent d1c4260859 4ae207aea0
commit f40aa17933
14 changed files with 68 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/guile/2.0.nix
-9
View File
@@ -93,15 +93,6 @@
setupHook = ./setup-hook-2.0.sh;
crossAttrs.preConfigure =
stdenv.lib.optionalString (hostPlatform.isHurd)
# On GNU, libgc depends on libpthread, but the cross linker doesn't
# know where to find libpthread, which leads to erroneous test failures
# in `configure', where `-pthread' and `-lpthread' aren't explicitly
# passed. So it needs some help (XXX).
"export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
meta = {
description = "Embeddable Scheme implementation";
homepage = http://www.gnu.org/software/guile/;
pkgs/development/interpreters/guile/default.nix
-9
View File
@@ -89,15 +89,6 @@
setupHook = ./setup-hook-2.2.sh;
crossAttrs.preConfigure =
stdenv.lib.optionalString (hostPlatform.isHurd)
# On GNU, libgc depends on libpthread, but the cross linker doesn't
# know where to find libpthread, which leads to erroneous test failures
# in `configure', where `-pthread' and `-lpthread' aren't explicitly
# passed. So it needs some help (XXX).
"export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
meta = {
description = "Embeddable Scheme implementation";
homepage = http://www.gnu.org/software/guile/;