Unverified Commit 37a8a327 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #119392 from samuela/upkeep-bot/vscodium-1.55.2-1618381422 

vscodium: 1.55.0 -> 1.55.2
parents 316db3a1 7e45a406

pkgs/applications/editors/vscode/generic.nix

+27 −24
Original line number Diff line number Diff line
@@ -61,17 +61,18 @@ in 
    };



    buildInputs = [ libsecret libXScrnSaver libxshmfence ]

      ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages);

      ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk ] ++ atomEnv.packages);



    runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];



    nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook;

    nativeBuildInputs = [unzip] ++ lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook wrapGAppsHook ];



    dontBuild = true;

    dontConfigure = true;



    installPhase =

      if system == "x86_64-darwin" then ''

    installPhase = ''

      runHook preInstall

    '' + (if system == "x86_64-darwin" then ''

      mkdir -p "$out/Applications/${longName}.app" $out/bin

      cp -r ./* "$out/Applications/${longName}.app"

      ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName}
@@ -91,6 +92,8 @@ in 
      # Override the previously determined VSCODE_PATH with the one we know to be correct

      sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName}

      grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded

    '') + ''

      runHook postInstall

    '';



    inherit meta;

pkgs/applications/editors/vscode/vscodium.nix

+5 −5
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ let 
  archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";



  sha256 = {

    x86_64-linux = "0zzdbknmljf1hizmxnrby17i8v3kp98rklinywnr632jwgjms81j";

    x86_64-darwin = "0mccq1b0l6r1ipxp5gvyam43c2hh8hxdvwqikkz6g7y93p29wz9g";

    aarch64-linux = "12gpday6gzl1adcykqhgz3xrdm9568a26gsndmplkn2n6l6agnp0";

    armv7l-linux = "0l886vdw7az0nvvhh14pjawz0yyib59ymychy7gbk8ay5g9vfv03";

    x86_64-linux = "12mdila9gspj6b9s6488j0ba264vm4a46546kplma7s6gkkpz4zx";

    x86_64-darwin = "15wdznihc2ra2fjy9p4j898vazjr4h5yighaxh7jk9kcvarg1658";

    aarch64-linux = "0plw1an1z3v333irbc53skrmq2klas21srriiqkvmkgkfvpx1rq2";

    armv7l-linux = "1ys82pa18qshpinaqqrskxvljzap20xwj5ncffn031yacg1y2qx2";

  }.${system};



  sourceRoot = {
@@ -33,7 +33,7 @@ in 


    # Please backport all compatible updates to the stable release.

    # This is important for the extension ecosystem.

    version = "1.55.0";

    version = "1.55.2";

    pname = "vscodium";



    executableName = "codium";