Unverified Commit 7739d3ac authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #187764 from SamLukeYes/vscode

parents f69e050c 2c4f8fca

pkgs/applications/editors/vscode/generic.nix

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
, nodePackages, bash



# Attributes inherit from specific versions

, version, src, meta, sourceRoot

, version, src, meta, sourceRoot, commandLineArgs

, executableName, longName, shortName, pname, updateScript

# sourceExecutableName is the name of the binary in the source archive, over

# which we have no control
@@ -110,6 +110,7 @@ let 
        # Add gio to PATH so that moving files to the trash works when not using a desktop environment

        --prefix PATH : ${glib.bin}/bin

        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"

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

      )

    '';

pkgs/applications/editors/vscode/vscode.nix

+5 −1
Original line number Diff line number Diff line 
{ stdenv, lib, callPackage, fetchurl, isInsiders ? false }:

{ stdenv, lib, callPackage, fetchurl

, isInsiders ? false

, commandLineArgs ? ""

}:



let

  inherit (stdenv.hostPlatform) system;
@@ -31,6 +34,7 @@ in 
    executableName = "code" + lib.optionalString isInsiders "-insiders";

    longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";

    shortName = "Code" + lib.optionalString isInsiders " - Insiders";

    inherit commandLineArgs;



    src = fetchurl {

      name = "VSCode_${version}_${plat}.${archive_fmt}";

pkgs/applications/editors/vscode/vscodium.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, callPackage, fetchurl, nixosTests }:

{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "" }:



let

  inherit (stdenv.hostPlatform) system;
@@ -25,7 +25,7 @@ let 
  sourceRoot = if stdenv.isDarwin then "" else ".";

in

  callPackage ./generic.nix rec {

    inherit sourceRoot;

    inherit sourceRoot commandLineArgs;



    # Please backport all compatible updates to the stable release.

    # This is important for the extension ecosystem.