commit 077d0524ccfec44c00b469833ad7b5d8a984e7f6 · pyrox.dev/nixpkgs

+15 -13

pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix pkgs/tools/virtualization/google-guest-oslogin/default.nix

···

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
       -
         pname = "google-compute-engine-oslogin";

     

       13
       13
       -
         version = "20210429.00";

     

       12
       12
       +
         pname = "google-guest-oslogin";

     

       13
       13
       +
         version = "20211213.00";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "GoogleCloudPlatform";

     

       17
       17
        
           repo = "guest-oslogin";

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "eHAg9K5oxcygEzqaac81jSFHF+zsW6uB7q2Kfo9hSrA=";

     

       19
       19
       +
           sha256 = "sha256-8RuLYdWfk8zPfoF06r5E/6eHQ7tziZbgGhZlLCUW600=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

     

       23
       23
        
           # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)

     

       24
       24
        
           substituteInPlace src/pam/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d

     

       25
       25
        
           # fix "User foo not allowed because shell /bin/bash does not exist"

     

       26
       26
       -
           substituteInPlace src/include/compat.h --replace /bin/bash ${bashInteractive}/bin/bash

     

       26
       26
       +
           substituteInPlace src/include/compat.h --replace /bin/bash /run/current-system/sw/bin/bash

     

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
       -
         buildInputs = [ curl.dev pam ];

     

       29
       29
       +
         buildInputs = [ curl.dev pam json_c ];

     

       30
       30
        
       

     

       31
       31
       -
         NIX_CFLAGS_COMPILE = "-I${json_c.dev}/include/json-c";

     

       32
       32
       -
         NIX_CFLAGS_LINK = "-L${json_c}/lib";

     

       31
       31
       +
         NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" ];

     

       33
       32
        
       

     

       34
       33
        
         makeFlags = [

     

       35
       34
        
           "VERSION=${version}"

     

       36
       36
       -
           "DESTDIR=${placeholder "out"}"

     

       37
       37
       -
           "PREFIX=/"

     

       38
       38
       -
           "BINDIR=/bin"

     

       39
       39
       -
           "LIBDIR=/lib"

     

       40
       40
       -
           "PAMDIR=/lib"

     

       41
       41
       -
           "MANDIR=/share/man"

     

       35
       35
       +
           "PREFIX=$(out)"

     

       36
       36
       +
           "MANDIR=$(out)/share/man"

     

       37
       37
       +
           "SYSTEMDDIR=$(out)/etc/systemd/system"

     

       38
       38
       +
           "PRESETDIR=$(out)/etc/systemd/system-preset"

     

       42
       39
        
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         postInstall = ''

     

       42
       42
       +
           sed -i "s,/usr/bin/,$out/bin/,g" $out/etc/systemd/system/google-oslogin-cache.service

     

       43
       43
       +
         '';

     

       43
       44
        
       

     

       44
       45
        
         enableParallelBuilding = true;

     

       45
       46
        
       

     
···

       51
       52
        
           homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages";

     

       52
       53
        
           description = "OS Login Guest Environment for Google Compute Engine";

     

       53
       54
        
           license = licenses.asl20;

     

       55
       55
       +
           platforms = platforms.linux;

     

       54
       56
        
           maintainers = with maintainers; [ flokli ];

     

       55
       57
        
         };

     

       56
       58
        
       }

+1 -1

pkgs/top-level/all-packages.nix

···

       6103
       6103
        
       

     

       6104
       6104
        
         google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine;

     

       6105
       6105
        
       

     

       6106
       6106
       -
         google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { };

     

       6106
       6106
       +
         google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { };

     

       6107
       6107
        
       

     

       6108
       6108
        
         google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { };

     

       6109
       6109