summary refs log tree commit diff
path: root/pkgs/development/guile-modules
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-08-04 12:10:38 +0200
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-08-04 12:11:11 +0200
commita07806b9dce8e190c540fd3897d5d112c45b42cd (patch)
tree7bf5d77558353b39452dc598b7c3424b5278eeae /pkgs/development/guile-modules
parent98edae65c0cd947649b64788192b693028498c77 (diff)
downloadnixpkgs-a07806b9dce8e190c540fd3897d5d112c45b42cd.tar
nixpkgs-a07806b9dce8e190c540fd3897d5d112c45b42cd.tar.gz
nixpkgs-a07806b9dce8e190c540fd3897d5d112c45b42cd.tar.bz2
nixpkgs-a07806b9dce8e190c540fd3897d5d112c45b42cd.tar.lz
nixpkgs-a07806b9dce8e190c540fd3897d5d112c45b42cd.tar.xz
nixpkgs-a07806b9dce8e190c540fd3897d5d112c45b42cd.tar.zst
nixpkgs-a07806b9dce8e190c540fd3897d5d112c45b42cd.zip
guile-ncurses: 1.7 -> 3.1
Diffstat (limited to 'pkgs/development/guile-modules')
-rw-r--r--pkgs/development/guile-modules/guile-ncurses/default.nix29
1 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index abfa144ee57..f982ff600b8 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "guile-ncurses";
-  version = "1.7";
+  version = "3.1";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q=";
+    hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM=";
   };
 
   nativeBuildInputs = [
@@ -25,19 +25,20 @@ stdenv.mkDerivation rec {
     ncurses
   ];
 
-  preConfigure = ''
-    configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site"
-  '';
-
-  postFixup = ''
-    for f in $out/share/guile/site/ncurses/**.scm; do \
-      substituteInPlace $f \
-        --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \
-    done
-  '';
+  configureFlags = [
+    "--with-gnu-filesystem-hierarchy"
+  ];
 
-  # Undefined symbols for architecture arm64: "_u32_conv_from_encoding"
-  env.NIX_LDFLAGS = "-lunistring";
+  postFixup =
+    let
+      guileVersion = lib.versions.majorMinor guile.version;
+    in
+    ''
+      for f in $out/share/guile/site/ncurses/**.scm; do \
+        substituteInPlace $f \
+          --replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \
+      done
+    '';
 
   # XXX: 1 of 65 tests failed.
   doCheck = false;