diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-05 22:08:23 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-05 22:08:23 +0200 |
| commit | f48570f223115a68c6a1e0ad4c16082a5dc53e84 (patch) | |
| tree | 166dcf3509fd50edfbf5adc6ea5fe3717ce16684 /pkgs/development/guile-modules | |
| parent | 2cceb70b13f898e09e95412e04e757a7b46cae80 (diff) | |
treewide: fixup
Diffstat (limited to 'pkgs/development/guile-modules')
5 files changed, 15 insertions, 19 deletions
diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix index 91151e343722f..8fe69b2684084 100644 --- a/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-guile-site-dir=${builtins.placeholder "out"}/share/guile/site" - "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/share/guile/site" - "--with-guile-extension-dir=${builtins.placeholder "out"}/share/guile/extensions" + "--with-guile-site-dir=${builtins.placeholder "out"}/${guile.siteDir}" + "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/${guile.siteCcacheDir}" + "--with-guile-extension-dir=${builtins.placeholder "out"}/lib/guile/${guile.effectiveVersion}/extensions" ]; meta = with lib; { diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index f982ff600b8bc..7c092db5a7eb7 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -29,16 +29,12 @@ stdenv.mkDerivation rec { "--with-gnu-filesystem-hierarchy" ]; - 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 - ''; + postFixup = '' + for f in $out/${guile.siteDir}/ncurses/**.scm; do \ + substituteInPlace $f \ + --replace "libguile-ncurses" "$out/lib/guile/${guile.effectiveVersion}/libguile-ncurses"; \ + done + ''; # XXX: 1 of 65 tests failed. doCheck = false; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 7387dbc208767..edc6d73fffccd 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { libffi ]; - GUILE_SITE="${guile-lib}/share/guile/site"; + env.GUILE_SITE = "${guile-lib}/${guile.siteDir}"; - configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ]; + configureFlags = [ "--with-guilemoduledir=$(out)/${guile.siteDir}" ]; meta = with lib; { homepage = "https://www.nongnu.org/guile-reader/"; diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix index 6cf9f5e4efac3..e7654b747c3a1 100644 --- a/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/pkgs/development/guile-modules/guile-ssh/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; }; - configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ]; + configureFlags = [ "--with-guilesitedir=\${out}/${guile.siteDir}" ]; postFixup = '' - for f in $out/share/guile/site/ssh/**.scm; do \ + for f in $out/${guile.siteDir}/ssh/**.scm; do \ substituteInPlace $f \ --replace "libguile-ssh" "$out/lib/libguile-ssh"; \ done diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index 19a790db77a45..2102e395d0b30 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-guile-site-dir=$out/share/guile/site" - "--with-guile-site-ccache-dir=$out/share/guile/site" + "--with-guile-site-dir=$(out)/${guile.siteDir}" + "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}" ]; makeFlags = [ |