summary refs log tree commit diff
path: root/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix')
-rw-r--r--pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
index 012090ba079..7251b418d4e 100644
--- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
@@ -7,21 +7,22 @@
 
 stdenv.mkDerivation rec {
   name = "google-compute-engine-oslogin-${version}";
-  version = "1.4.3";
+  version = "1.5.3";
+  # from packages/google-compute-engine-oslogin/packaging/debian/changelog
 
   src = fetchFromGitHub {
-    repo = "compute-image-packages";
     owner = "GoogleCloudPlatform";
-    rev = "2ccfe80f162a01b5b7c3316ca37981fc8b3fc32a";
-    sha256 = "036g7609ni164rmm68pzi47vrywfz2rcv0ad67gqf331pvlr92x1";
+    repo = "compute-image-packages";
+    rev = "20190522";
+    sha256 = "16jbbrnz49g843h813r408dbvfa2hicf8canxwbfxr2kzhv7ycmm";
   };
-  sourceRoot = "source/google_compute_engine_oslogin";
+  sourceRoot = "source/packages/google-compute-engine-oslogin";
 
   postPatch = ''
     # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)
     substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d
     # fix "User foo not allowed because shell /bin/bash does not exist"
-    substituteInPlace utils/oslogin_utils.cc --replace /bin/bash ${stdenv.shell}
+    substituteInPlace compat.h --replace /bin/bash ${stdenv.shell}
   '';
 
   buildInputs = [ curl.dev pam ];
@@ -39,6 +40,8 @@ stdenv.mkDerivation rec {
     install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/GoogleCloudPlatform/compute-image-packages;
     description = "OS Login Guest Environment for Google Compute Engine";