diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-27 18:40:33 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-27 18:40:41 +0000 |
commit | 030c5028b07afcedce7c5956015c629486cc79d9 (patch) | |
tree | 4c3cb9c6cff0e30919a97fc0c1d3203446696f4e /pkgs/development/guile-modules | |
parent | 4b852f7ef3cb92277f212ba7dc168da1073e65cc (diff) | |
parent | 04c0744afbab2369baf4f134c544db3f24164d80 (diff) | |
download | nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.gz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.bz2 nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.lz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.xz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.zst nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.zip |
Rebase onto c1a53897ad4290a1cbfa02fbe6f3869577b93744
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/development/guile-modules')
-rw-r--r-- | pkgs/development/guile-modules/guile-ssh/default.nix | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix index e7654b747c3..a1928c78ce7 100644 --- a/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/pkgs/development/guile-modules/guile-ssh/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , guile , libssh , autoreconfHook @@ -9,43 +10,57 @@ , which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-ssh"; version = "0.16.3"; src = fetchFromGitHub { owner = "artyom-poptsov"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; + repo = "guile-ssh"; + rev = "v${finalAttrs.version}"; + hash = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; }; - configureFlags = [ "--with-guilesitedir=\${out}/${guile.siteDir}" ]; + patches = [ + (fetchpatch { + url = "https://github.com/artyom-poptsov/guile-ssh/pull/31/commits/38636c978f257d5228cd065837becabf5da16854.patch"; + hash = "sha256-J+TDgdjihKoEjhbeH+BzqrHhjpVlGdscRj3L/GAFgKg="; + }) + ]; - postFixup = '' - for f in $out/${guile.siteDir}/ssh/**.scm; do \ - substituteInPlace $f \ - --replace "libguile-ssh" "$out/lib/libguile-ssh"; \ - done - ''; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config texinfo which + autoreconfHook + guile + pkg-config + texinfo + which ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ libssh ]; enableParallelBuilding = true; + # FAIL: server-client.scm + doCheck = !stdenv.isDarwin; + + postInstall = '' + mv $out/bin/*.scm $out/share/guile-ssh + rmdir $out/bin + ''; + meta = with lib; { description = "Bindings to Libssh for GNU Guile"; homepage = "https://github.com/artyom-poptsov/guile-ssh"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 ]; + maintainers = with maintainers; [ ethancedwards8 foo-dogsquared ]; platforms = guile.meta.platforms; }; -} +}) |