about summary refs log tree commit diff
diff options
context:
space:
mode:
authorxd1le <elisp.vim@gmail.com>2017-09-28 00:46:25 +1000
committerRobin Gloster <mail@glob.in>2017-09-28 14:51:41 +0200
commitf1b7d0a54fd65308ce3daa523c72726aa61d8afe (patch)
tree9f42800df08b5aa29c9e951ef2ef59c561c48b14
parent88ef99e2c3f0eece4fa441ff3477af3d19d3d67a (diff)
downloadnixlib-f1b7d0a54fd65308ce3daa523c72726aa61d8afe.tar
nixlib-f1b7d0a54fd65308ce3daa523c72726aa61d8afe.tar.gz
nixlib-f1b7d0a54fd65308ce3daa523c72726aa61d8afe.tar.bz2
nixlib-f1b7d0a54fd65308ce3daa523c72726aa61d8afe.tar.lz
nixlib-f1b7d0a54fd65308ce3daa523c72726aa61d8afe.tar.xz
nixlib-f1b7d0a54fd65308ce3daa523c72726aa61d8afe.tar.zst
nixlib-f1b7d0a54fd65308ce3daa523c72726aa61d8afe.zip
guile-gnome: fix build by building gwrap with guile-2.0
Apparently gwrap will not compile with guile-2.2 [1], even though the
news for version 1.9.15 says it "allows" Guile 2.2 [2]:

> it will _not_ compile using 2.2

Furthermore, it seems like it isn't being developed anymore either [1]:

> Also note that g-wrap itself is not being further developed anymore,
> it is recommended for new projects to use Guile's dynamic FFI.

Also, guile-gnome-2.16.5 is apparently compatible with guile-2.2 [3],
but I'm not sure how they built it with guile-2.2 because gwrap 1.9.15
(latest release) apparently doesn't build with guile-2.2. (And certainly
when I try to build gwrap 1.9.15 with guile-2.2 it doesn't work. Maybe
it can be made to work with certain compile flags, but I haven't pursued
that further due to [1] anyway.) This is why guile-gnome is still on
2.16.4 here. Because, although 2.16.5 can still (apparently) build with
guile-2.0.14, guile_2_0 is only at guile-2.0.13.

So to update guile-gnome to 2.16.5, guile_2_0 would first have to be
updated to 2.0.14.

[1]: http://lists.nongnu.org/archive/html/g-wrap-dev/2016-08/msg00001.html
[2]: http://www.nongnu.org/g-wrap/news.html
[3]: https://www.gnu.org/software/guile-gnome/news.html
-rw-r--r--pkgs/top-level/all-packages.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ccda31fb5a6..b3cffbb4c451 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6734,16 +6734,21 @@ with pkgs;
 
   jython = callPackage ../development/interpreters/jython {};
 
-  guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
+  guile-cairo = callPackage ../development/guile-modules/guile-cairo {
+    guile = guile_2_0;
+  };
 
   guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
 
   guile-gnome = callPackage ../development/guile-modules/guile-gnome {
     gconf = gnome2.GConf;
+    guile = guile_2_0;
     inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui;
   };
 
-  guile-lib = callPackage ../development/guile-modules/guile-lib { };
+  guile-lib = callPackage ../development/guile-modules/guile-lib {
+    guile = guile_2_0;
+  };
 
   guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { };
 
@@ -7193,7 +7198,9 @@ with pkgs;
     guile = guile_1_8;
   };
 
-  gwrap = callPackage ../development/tools/guile/g-wrap { };
+  gwrap = callPackage ../development/tools/guile/g-wrap {
+    guile = guile_2_0;
+  };
 
   help2man = callPackage ../development/tools/misc/help2man {
     inherit (perlPackages) LocaleGettext;