public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

google-cloud-sdk: prefer using a pythonEnv vs just a search path

Browse Source 
Previously only direct dependencies were available in the python search
path. Transitive dependencies would not be available and thus a few
features would not work due to import errors. Those import errors were
being caugth and gave a (wrong) hint why it wouldn't work. By using
`python.withPackages` instead of the crafted search path with only the
direct dependencies those missing feature should now be working.

See issue #67094 for details on the observed errors.

Fixes #67094
This commit is contained in:
Andreas Rammhold 2019-09-09 10:44:39 +02:00
parent 5f3d43fedf
commit 4fdbdcede0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@ -13,7 +13,7 @@
let let
pythonInputs = [ cffi cryptography pyopenssl crcmod ] pythonInputs = [ cffi cryptography pyopenssl crcmod ]
++ lib.optional (with-gce) google-compute-engine; ++ lib.optional (with-gce) google-compute-engine;
pythonPath = lib.makeSearchPath python.sitePackages pythonInputs; pythonEnv = python.withPackages (_: pythonInputs);
baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads"; baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
sources = name: system: { sources = name: system: {
@ -53,8 +53,8 @@ in stdenv.mkDerivation rec {
programPath="$out/google-cloud-sdk/bin/$program" programPath="$out/google-cloud-sdk/bin/$program"
binaryPath="$out/bin/$program" binaryPath="$out/bin/$program"
wrapProgram "$programPath" \ wrapProgram "$programPath" \
--set CLOUDSDK_PYTHON "${python}/bin/python" \ --set CLOUDSDK_PYTHON "${pythonEnv}/bin/python" \
--prefix PYTHONPATH : "${pythonPath}" --prefix PYTHONPATH : "${pythonEnv}/${python.sitePackages}"
mkdir -p $out/bin mkdir -p $out/bin
ln -s $programPath $binaryPath ln -s $programPath $binaryPath