chore: use vencord from nixpkgs

This commit is contained in:
uku 2025-02-19 09:10:42 +01:00
parent 99afb428a5
commit c1f5f4b006
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
4 changed files with 2 additions and 56 deletions

View file

@ -7,7 +7,6 @@
camasca, camasca,
home-manager, home-manager,
nixpkgs, nixpkgs,
vencord,
... ...
}: }:
let let
@ -144,7 +143,7 @@ in
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
flake.setNixPath = false; flake.setNixPath = false;
overlays = [ (import ../exprs/overlay.nix { inherit vencord; }) ]; overlays = [ (import ../exprs/overlay.nix) ];
}; };
programs = { programs = {

View file

@ -1,4 +1,4 @@
inputs: final: prev: { final: prev: {
idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { }; idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { };
urbackup-client = prev.urbackup-client.overrideAttrs (old: { urbackup-client = prev.urbackup-client.overrideAttrs (old: {
@ -10,34 +10,4 @@ inputs: final: prev: {
"--localstatedir=/var/lib" "--localstatedir=/var/lib"
]; ];
}); });
vencord = prev.vencord.overrideAttrs (old: {
version = "${old.version}+git.${inputs.vencord.shortRev}";
src = inputs.vencord;
env = old.env // {
VENCORD_REMOTE = "Vendicated/Vencord";
VENCORD_HASH = inputs.vencord.shortRev;
ESBUILD_BINARY_PATH = prev.lib.getExe (
prev.esbuild.overrideAttrs (
final: _: {
version = "0.25.0";
src = prev.fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${final.version}";
hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
}
)
);
};
pnpmDeps = old.pnpmDeps.overrideAttrs (_: {
outputHash = "sha256-0afgeJkK0OQWoqF0b8pHPMsiTKox84YmwBhtNWGyVAg=";
outputHashAlgo = "sha256";
});
});
} }

17
flake.lock generated
View file

@ -248,7 +248,6 @@
"systems": "systems", "systems": "systems",
"treefmt-nix": "treefmt-nix", "treefmt-nix": "treefmt-nix",
"ukubot-rs": "ukubot-rs", "ukubot-rs": "ukubot-rs",
"vencord": "vencord",
"vscode-extensions": "vscode-extensions" "vscode-extensions": "vscode-extensions"
} }
}, },
@ -331,22 +330,6 @@
"type": "github" "type": "github"
} }
}, },
"vencord": {
"flake": false,
"locked": {
"lastModified": 1739756829,
"narHash": "sha256-Szweth0AVabzI336SSHKTTET+0T77TMkexuIUukg9KY=",
"owner": "Vendicated",
"repo": "Vencord",
"rev": "1f6720318354e026fe24ed3e76935ec9e42d5193",
"type": "github"
},
"original": {
"owner": "Vendicated",
"repo": "Vencord",
"type": "github"
}
},
"vscode-extensions": { "vscode-extensions": {
"inputs": { "inputs": {
"flake-compat": [], "flake-compat": [],

View file

@ -139,11 +139,5 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
}; };
# ==== non-nix inputs ====
vencord = {
url = "github:Vendicated/Vencord";
flake = false;
};
}; };
} }