Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3772959864e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6106e8d028b7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 5, 2019

  1. vscode: Make it so that it places the .app in /Applications on macOS

    @AmandaCameron
    AmandaCameron committed Oct 5, 2019
    Copy the full SHA
    317a011 View commit details

  2. Merge pull request #70486 from DarkDNA/mac-fixes/vscode 

    vscode: Make it so that it places the .app in $out/Applications on macOS
    @marsam
    marsam authored Oct 5, 2019
    Copy the full SHA
    6106e8d View commit details
Showing with 9 additions and 5 deletions.
  1. +3 −3 pkgs/applications/editors/vscode/generic.nix
  2. +6 −2 pkgs/applications/editors/vscode/vscodium.nix
6 changes: 3 additions & 3 deletions pkgs/applications/editors/vscode/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -69,9 +69,9 @@ in

installPhase =
if system == "x86_64-darwin" then ''
mkdir -p $out/lib/vscode $out/bin
cp -r ./* $out/lib/vscode
ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin
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}
'' else ''
mkdir -p $out/lib/vscode $out/bin
cp -r ./* $out/lib/vscode
8 changes: 6 additions & 2 deletions pkgs/applications/editors/vscode/vscodium.nix
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,14 @@ let
x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb";
x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5";
}.${system};

sourceRoot = {
x86_64-linux = ".";
x86_64-darwin = "";
}.${system};
in
callPackage ./generic.nix rec {
inherit sourceRoot;

version = "1.38.1";
pname = "vscodium";
@@ -29,8 +35,6 @@ in
inherit sha256;
};

sourceRoot = ".";

meta = with stdenv.lib; {
description = ''
Open source source code editor developed by Microsoft for Windows,