Unverified Commit a634d19b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #247363 from wegank/guile-refactor-1 

guile: canonicalize site dirs
parents ace966bb f48570f2

pkgs/applications/misc/haunt/default.nix

+5 −9
Original line number Diff line number Diff line
@@ -49,14 +49,10 @@ stdenv.mkDerivation rec { 
  # Test suite is non-determinisitic in later versions

  doCheck = false;



  postInstall =

    let

      guileVersion = lib.versions.majorMinor guile.version;

    in

    ''

  postInstall = ''

    wrapProgram $out/bin/haunt \

        --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \

        --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH"

      --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \

      --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"

  '';



  doInstallCheck = true;

pkgs/development/guile-modules/guile-gnutls/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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; {

pkgs/development/guile-modules/guile-ncurses/default.nix

+6 −10
Original line number Diff line number Diff line
@@ -29,14 +29,10 @@ 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 \

  postFixup = ''

    for f in $out/${guile.siteDir}/ncurses/**.scm; do \

      substituteInPlace $f \

          --replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \

        --replace "libguile-ncurses" "$out/lib/guile/${guile.effectiveVersion}/libguile-ncurses"; \

    done

  '';

pkgs/development/guile-modules/guile-reader/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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/";

pkgs/development/guile-modules/guile-ssh/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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