gitRepo: Add import to ssl module to avoid runtime error (#125373)
Co-authored-by: Ricardo M. Correia <rcorreia@wizy.org> (cherry picked from commit 8f166b95c9ee10743039d1f2b1c21f9edee5da88)
This commit is contained in:
committed by
Ricardo M. Correia
parent
592df52aa1
commit
8b0cabcf5c
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script
|
||||
, python3, git, gnupg, less
|
||||
, python3, git, gnupg, less, openssh
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -10,9 +10,12 @@ stdenv.mkDerivation rec {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ=";
|
||||
sha256 = "sha256-SuHp6C5ueUErvRiWDQNEmCybFIa7Iu7C/FtnHys9XqU=";
|
||||
};
|
||||
|
||||
# Fix 'NameError: name 'ssl' is not defined'
|
||||
patches = [ ./import-ssl-module.patch ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
@@ -34,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
# Important runtime dependencies
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/repo --prefix PATH ":" \
|
||||
"${lib.makeBinPath [ git gnupg less ]}"
|
||||
"${lib.makeBinPath [ git gnupg less openssh ]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
Reference in New Issue
Block a user