From 6e624c2b781d42e798247ec130500920b15a97cc Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 24 Sep 2024 23:49:05 -0400 Subject: [PATCH] overrides: pin vencord to flake input --- flake.lock | 19 ++++++++++++++++++- flake.nix | 3 +++ overlays/overrides.nix | 16 +++++++++++++++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 4c66b29..8de3777 100644 --- a/flake.lock +++ b/flake.lock @@ -907,7 +907,8 @@ "stable": "stable", "systems": "systems_2", "treefmt-nix": "treefmt-nix_2", - "universe-cli": "universe-cli" + "universe-cli": "universe-cli", + "vencord": "vencord" } }, "rust-analyzer-src": { @@ -1070,6 +1071,22 @@ "repo": "universe-cli", "type": "github" } + }, + "vencord": { + "flake": false, + "locked": { + "lastModified": 1727154824, + "narHash": "sha256-koAs4jlOQBU50f25qaogZEvvByGPlVBHBvqjyBQzjOs=", + "owner": "Vendicated", + "repo": "Vencord", + "rev": "cb2848f186f3d074d1a3390643aba70fa481eb6b", + "type": "github" + }, + "original": { + "owner": "Vendicated", + "repo": "Vencord", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4fe9012..57c2e62 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,9 @@ ## Conduwuit conduwuit.url = "github:girlbossceo/conduwuit"; + ## Vencord + vencord = { url = "github:Vendicated/Vencord"; flake = false; }; + ### Cleanup ### ## Common blank.url = "github:divnix/blank"; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 34aae2c..3db39cf 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -9,12 +9,17 @@ let latest = mkPkgsUnfree inputs.latest; fork = mkPkgs inputs.fork; stable = mkPkgs inputs.stable; + + versionFromInput = input: + let + slice = a: b: builtins.substring a b input.lastModifiedDate; + in + "0-unstable-${slice 0 5}-${slice 5 7}-${slice 7 9}"; in { inherit latest fork stable; inherit (latest) - vencord ; inherit (fork) @@ -24,6 +29,15 @@ in nix-melt ; + vencord = latest.vencord.overrideAttrs (old: { + src = inputs.vencord; + version = versionFromInput inputs.vencord; + env = old.env // { + VENCORD_REMOTE = "Vendicated/Vencord"; + VENCORD_HASH = builtins.substring 0 9 inputs.vencord.rev; + }; + }); + schildichat-desktop = stable.schildichat-desktop.override { electron = final.electron_30; }; python3 = prev.python3.override {