b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #118585 from cpcloud/fix-gce-python-path

Browse source 
google-compute-engine: fix incorrect usage of buildPythonApplication
This commit is contained in:
Bernardo Meurer 2021-04-05 17:03:59 +00:00 committed by GitHub
parent 56b8c368d8 58dfe32477
commit 2cd467894a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/virtualization/google-compute-engine/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, fetchFromGitHub
, buildPythonApplication
, buildPythonPackage
, bash
, bashInteractive
, systemd
@ -10,10 +10,9 @@
, distro
}:
buildPythonApplication rec {
buildPythonPackage rec {
pname = "google-compute-engine";
version = "20190124";
namePrefix = "";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
@ -25,7 +24,6 @@ buildPythonApplication rec {
buildInputs = [ bash ];
propagatedBuildInputs = [ boto setuptools distro ];
postPatch = ''
for file in $(find google_compute_engine -type f); do
substituteInPlace "$file" \
@ -54,6 +52,7 @@ buildPythonApplication rec {
'';
doCheck = false;
pythonImportsCheck = [ "google_compute_engine" ];
meta = with lib; {
description = "Google Compute Engine tools and services";