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