From d78074c018aeb532750a05f0723cd2ad9cf6309b Mon Sep 17 00:00:00 2001 From: Ruixi-rebirth Date: Sat, 18 Jan 2025 18:55:57 +0800 Subject: [PATCH] fix: missing dependencies --- flake.lock | 12 +++++----- flake.nix | 69 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 3b27aa7158..5f81cd2a5a 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a8c1b348e9..d7da55936d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,37 +5,46 @@ }; outputs = - { self - , nixpkgs - , flake-utils - , + { + self, + nixpkgs, + flake-utils, }: let - overlay = - final: prev: { - picom = prev.picom.overrideAttrs (oldAttrs: rec { - version = "master"; - src = ./.; - - buildInputs = (oldAttrs.buildInputs or [ ]) ++ [ prev.pcre ]; - }); - }; + overlay = final: prev: { + picom = prev.picom.overrideAttrs (oldAttrs: rec { + version = "master"; + src = ./.; + dontVersionCheck = true; + nativeBuildInputs = + (oldAttrs.nativeBuildInputs or [ ]) + ++ (with prev; [ + asciidoc + ]); + buildInputs = + (oldAttrs.buildInputs or [ ]) + ++ (with prev; [ + pcre + ]); + }); + }; in - flake-utils.lib.eachDefaultSystem - ( - system: - let - pkgs = import nixpkgs { - inherit system; - overlays = [ - self.overlays.default - ]; - }; - in - rec { - packages.picom = pkgs.picom; - packages.default = pkgs.picom; - } - ) - // { overlays.default = overlay; }; + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ + self.overlays.default + ]; + }; + in + rec { + packages.picom = pkgs.picom; + packages.default = pkgs.picom; + } + ) + // { + overlays.default = overlay; + }; }