vesktop: migrate from electron_40 to electron_42
electron_40 is EOL and marked insecure. Use electron_42 instead. Resolves: #542512
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
vencord,
|
||||
electron_40,
|
||||
electron_42,
|
||||
libicns,
|
||||
pipewire,
|
||||
libpulseaudio,
|
||||
@@ -26,7 +26,7 @@
|
||||
withSystemVencord ? false,
|
||||
}:
|
||||
let
|
||||
electron = electron_40;
|
||||
electron = electron_42;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vesktop";
|
||||
@@ -89,9 +89,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
preBuild = ''
|
||||
# Validate electron version matches upstream package.json
|
||||
if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1 | tr -d '^'`" != "${lib.versions.major electron.version}" ]
|
||||
then
|
||||
echo "ERROR: electron version mismatch between package.json and nixpkgs"
|
||||
expectedMajor="$(jq -r '.devDependencies.electron | ltrimstr("^") | split(".") | .[0]' < package.json)"
|
||||
actualMajor="${lib.versions.major electron.version}"
|
||||
if [ "$actualMajor" -lt "$expectedMajor" ] 2>/dev/null; then
|
||||
echo "ERROR: nixpkgs electron version (major $actualMajor) is older than upstream package.json requirement (major $expectedMajor)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user