chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-25.05] guix: Fix guile-ssh dependency for daemon offload (#410422)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-05-26 06:10:24 +00:00
committed by GitHub
parent 561424702c e3fa01d0e1
commit 2e9731e641
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@@ -10078,6 +10078,12 @@
githubId = 130903;
name = "Ana Hobden";
};
hpfr = {
email = "liam@hpfr.net";
github = "hpfr";
githubId = 44043764;
name = "Liam Hupfer";
};
hqurve = {
email = "hqurve@outlook.com";
github = "hqurve";

9
pkgs/by-name/gu/guix/package.nix
View File

@@ -71,6 +71,11 @@ stdenv.mkDerivation rec {
patch = "security/0102-daemon-Sanitize-successful-build-outputs-prior-to-ex.patch";
hash = "sha256-mOnlYtpIuYL+kDvSNuXuoDLJP03AA9aI2ALhap+0NOM=";
})
(fetchpatch {
name = "fix-guile-ssh-detection.patch";
url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=b8a45bd0473ab2ba9b96b7ef429a557ece9bf06c";
hash = "sha256-oYkgM694qPK8kqgxatkr4fj/GL73ozTNQADNyDeU6WY=";
})
];
postPatch = ''
@@ -146,7 +151,8 @@ stdenv.mkDerivation rec {
for f in $out/bin/*; do
wrapProgram $f \
--prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \
--prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"
--prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" \
--prefix GUILE_EXTENSIONS_PATH : "${guile-ssh}/lib/guile/3.0/extensions"
done
'';
@@ -175,6 +181,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [
cafkafk
foo-dogsquared
hpfr
];
platforms = platforms.linux;
};