Unverified Commit 93e48559 authored by Jon Seager's avatar Jon Seager Committed by GitHub
Browse files

google-chrome: fix makeWrapper invocation (#339734)

parents 83a5981f 827cc913

pkgs/by-name/go/google-chrome/package.nix

+7 −15
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ let 
        mv "$icon_file" "$logo_output_path/google-$appname.png"

      done



      # "--simulate-outdated-no-au" disables auto updates and browser outdated popup

      makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \

        --prefix LD_LIBRARY_PATH : "$rpath" \

        --prefix PATH            : "$binpath" \
@@ -243,13 +244,8 @@ let 
        --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \

        --set CHROME_WRAPPER  "google-chrome-$dist" \

        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \

        --add-flags ${

          lib.concatStringsSep " " [

            (lib.escapeShellArg commandLineArgs)

            # Disables auto updates and browser outdated popup

            "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'"

          ]

        }

        --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \

        --add-flags ${lib.escapeShellArg commandLineArgs}



      for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do

        patchelf --set-rpath $rpath $elf
@@ -288,15 +284,11 @@ let 
      cp -r *.app $out/Applications



      mkdir -p $out/bin

      makeWrapper $out/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome $out/bin/google-chrome-stable \

        --add-flags ${

          lib.concatStringsSep " " [

            (lib.escapeShellArg commandLineArgs)

            # Disables auto updates and browser outdated popup

            "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'"

          ]

        }



      # "--simulate-outdated-no-au" disables auto updates and browser outdated popup

      makeWrapper $out/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome $out/bin/google-chrome-stable \

        --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \

        --add-flags ${lib.escapeShellArg commandLineArgs}

      runHook postInstall

    '';

  });