Drop vscodium-m1
parent
c214e38f95
commit
58b2bfe2b8
|
@ -33,7 +33,6 @@
|
|||
{
|
||||
# Sub in x86 version of packages that don't build on Apple Silicon yet
|
||||
# inherit (final.pkgs-x86) foo;
|
||||
vscodium = final.vscodium-m1;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
@ -170,8 +169,6 @@
|
|||
system = "x86_64-darwin";
|
||||
inherit (nixpkgsConfig) config;
|
||||
};
|
||||
# Use local pkg for M1 native vscodium build
|
||||
vscodium-m1 = final.callPackage ./pkgs/vscodium-m1.nix { };
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -196,7 +193,7 @@
|
|||
inherit system;
|
||||
inherit (nixpkgsConfig) config;
|
||||
overlays = with self.overlays; [
|
||||
pkgs-unstable
|
||||
pkgs-master
|
||||
pkgs-stable
|
||||
colors
|
||||
apple-silicon
|
||||
|
|
|
@ -1,67 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, # VSCodium build deps
|
||||
git
|
||||
, curl
|
||||
, cacert
|
||||
, jq
|
||||
, nodejs
|
||||
, nodePackages
|
||||
, yarn
|
||||
, python3
|
||||
, xcodebuild
|
||||
, darwin
|
||||
, ...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vscodium";
|
||||
version = "1.67.0";
|
||||
|
||||
executableName = "codium";
|
||||
longName = "VSCodium";
|
||||
shortName = "vscodium";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/VSCodium/vscodium/archive/refs/tags/${version}.tar.gz";
|
||||
sha256 = "d7Ci1SzEkH+QBYnBEZQ6Jim7dO2NoDe2eK4xDqENnrI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with darwin.apple_sdk.frameworks; [
|
||||
git
|
||||
curl
|
||||
cacert
|
||||
jq
|
||||
nodejs
|
||||
nodePackages.npm
|
||||
yarn
|
||||
python3
|
||||
xcodebuild
|
||||
AppKit
|
||||
CoreServices
|
||||
Cocoa
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
. get_repo.sh
|
||||
SHOULD_BUILD=yes CI_BUILD=no OS_NAME=osx VSCODE_ARCH=arm64 . build.sh
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications/${longName}.app" "$out/bin"
|
||||
cp -r ./VSCode-darwin-arm64/${longName}.app/* "$out/Applications/${longName}.app"
|
||||
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${executableName}" "$out/bin/${executableName}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta.platforms = [ "aarch64-darwin" ];
|
||||
}
|
Loading…
Reference in New Issue