diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-13 11:31:24 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 23:30:37 -0400 |
commit | 330ca731e88ec015181c43d92ae8f7c77cf0226a (patch) | |
tree | 1e840031c407cd50702ff78d05daca2f28c45c46 /pkgs/development/interpreters/guile/1.8.nix | |
parent | d7160f39bd46e8ee86e95cbaf7a8f3d5685ab30c (diff) | |
download | nixlib-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar nixlib-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.gz nixlib-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.bz2 nixlib-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.lz nixlib-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.xz nixlib-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.zst nixlib-330ca731e88ec015181c43d92ae8f7c77cf0226a.zip |
treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of dependencies is replaced with a dedicated `strictDeps` for that purpose. (Experience has shown that my punning was a terrible idea that made more difficult and embarrising to teach teach.) Now that is is clear, a few packages now use `strictDeps`, to fix various bugs: - bintools-wrapper and cc-wrapper
Diffstat (limited to 'pkgs/development/interpreters/guile/1.8.nix')
-rw-r--r-- | pkgs/development/interpreters/guile/1.8.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index cf42c9a7b683..658b2cce77f9 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { setOutputFlags = false; # $dev gets into the library otherwise # GCC 4.6 raises a number of set-but-unused warnings. - configureFlags = [ "--disable-error-on-warning" ]; + configureFlags = [ "--disable-error-on-warning" ] + # Guile needs patching to preset results for the configure tests about + # pthreads, which work only in native builds. + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "--with-threads=no"; depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (hostPlatform != buildPlatform) @@ -34,17 +38,8 @@ stdenv.mkDerivation rec { libtool ]; - patches = [ ./cpp-4.5.patch ]; - # Guile needs patching to preset results for the configure tests - # about pthreads, which work only in native builds. - preConfigure = '' - if test -n "$crossConfig"; then - configureFlags="--with-threads=no $configureFlags" - fi - ''; - preBuild = '' sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c ''; |