diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-29 16:47:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-29 16:47:29 +0200 |
commit | c2c30d926c39cd82b88a3e0c68bc980cd374c72c (patch) | |
tree | fde3ddf381b360c399228af22616d47fa8cd0f4d /pkgs/tools | |
parent | f7ac956a2b5b8c7f3a50c63547af493c68372169 (diff) | |
parent | 21da5c4f6f8a63475545751aee53552ee9bc72eb (diff) | |
download | nixlib-c2c30d926c39cd82b88a3e0c68bc980cd374c72c.tar nixlib-c2c30d926c39cd82b88a3e0c68bc980cd374c72c.tar.gz nixlib-c2c30d926c39cd82b88a3e0c68bc980cd374c72c.tar.bz2 nixlib-c2c30d926c39cd82b88a3e0c68bc980cd374c72c.tar.lz nixlib-c2c30d926c39cd82b88a3e0c68bc980cd374c72c.tar.xz nixlib-c2c30d926c39cd82b88a3e0c68bc980cd374c72c.tar.zst nixlib-c2c30d926c39cd82b88a3e0c68bc980cd374c72c.zip |
Merge pull request #86319 from flokli/google-oslogin
nixos/google-oslogin: bump package, make tests more readable
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 31ea1cb2a946..2c2444de4e52 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , curl , json_c @@ -8,22 +9,20 @@ stdenv.mkDerivation rec { pname = "google-compute-engine-oslogin"; - version = "1.5.3"; - # from packages/google-compute-engine-oslogin/packaging/debian/changelog + version = "20200325.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; - repo = "compute-image-packages"; - rev = "20190522"; - sha256 = "16jbbrnz49g843h813r408dbvfa2hicf8canxwbfxr2kzhv7ycmm"; + repo = "guest-oslogin"; + rev = version; + sha256 = "03hk95pgzcgy6ginp8zdy0fbk88m6n65qq22jq490z1xwbjffm8r"; }; - 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 + substituteInPlace src/pam/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 compat.h --replace /bin/bash ${bashInteractive}/bin/bash + substituteInPlace src/include/compat.h --replace /bin/bash ${bashInteractive}/bin/bash ''; buildInputs = [ curl.dev pam ]; @@ -31,15 +30,15 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c"; NIX_CFLAGS_LINK="-L${json_c}/lib"; - installPhase = '' - mkdir -p $out/{bin,lib} - - install -Dm755 libnss_cache_google-compute-engine-oslogin-${version}.so $out/lib/libnss_cache_oslogin.so.2 - install -Dm755 libnss_google-compute-engine-oslogin-${version}.so $out/lib/libnss_oslogin.so.2 - - install -Dm755 pam_oslogin_admin.so pam_oslogin_login.so $out/lib - install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin - ''; + makeFlags = [ + "VERSION=${version}" + "DESTDIR=${placeholder "out"}" + "PREFIX=/" + "BINDIR=/bin" + "LIBDIR=/lib" + "PAMDIR=/lib" + "MANDIR=/share/man" + ]; enableParallelBuilding = true; |