From f17dd885896d41b8d6e55ed9d19aed6a6f79054d Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 22 Sep 2023 01:24:18 +0800 Subject: guile-lib: add foo-dogsquared as maintainer --- pkgs/development/guile-modules/guile-lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 2678bcb2c058..23576729ac02 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { for Guile". ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = with maintainers; [ vyp foo-dogsquared ]; platforms = guile.meta.platforms; }; } -- cgit 1.4.1 From 08070c94d93c7570dc8cedf6fb8097a5eed7f4e9 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 22 Sep 2023 01:24:47 +0800 Subject: guile-lib: fix module installation in the output This should now make Guile recognize it as one of the module in its search path. --- pkgs/development/guile-modules/guile-lib/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 23576729ac02..75e45b00d4e7 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, autoreconfHook , guile , pkg-config , texinfo @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + autoreconfHook pkg-config ]; buildInputs = [ @@ -23,6 +25,12 @@ stdenv.mkDerivation rec { texinfo ]; + postPatch = '' + substituteInPlace configure.ac \ + --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ + --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' + ''; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; doCheck = !stdenv.isDarwin; -- cgit 1.4.1