From 0d14cc41a8556e9e1e3e173636153db183a83a2e Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 23 Dec 2024 14:36:33 -0700 Subject: [PATCH] [NixOS] Bring back dccsillag picom --- nixos/flake.lock | 24 ++++++++++++------------ nixos/overlay.nix | 23 +++++++++++++---------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index d88f16cb..2cb288db 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -839,11 +839,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1734893686, + "narHash": "sha256-JUEZn9MmpLGsW4J3luSX+R4BhcThccYpYg5AuKW7zG0=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "edb8b00e4d17b2116b60eca50f38ac68f12b9ab4", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1734472415, - "narHash": "sha256-IT/mQWd1pWSpljxCi8nJ1PpTt8SPDcQ0TPEmkNLXcwY=", + "lastModified": 1734708505, + "narHash": "sha256-NyQErDMVmRB0xPLLylZcw1mIBH3d8bSue8Fp+vRBLso=", "owner": "NixOS", "repo": "nix", - "rev": "3f3feae33e3381a2ea5928febe03329f0a578b20", + "rev": "f72752c0dc6547b1568a9ef46deba875e38fada2", "type": "github" }, "original": { @@ -1234,11 +1234,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -1725,11 +1725,11 @@ }, "unstable": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { diff --git a/nixos/overlay.nix b/nixos/overlay.nix index 90432062..5b9cb02c 100644 --- a/nixos/overlay.nix +++ b/nixos/overlay.nix @@ -17,16 +17,19 @@ final: prev: { }; }); - # picom = prev.picom.overrideAttrs (old: { - # src = prev.fetchFromGitHub { - # repo = "picom"; - # owner = "dccsillag"; - # rev = "51b21355696add83f39ccdb8dd82ff5009ba0ae5"; - # sha256 = "sha256-crCwRJd859DCIC0pEerpDqdX2j8ZrNAzVaSSB3mTPN8=="; - # }; - # nativeBuildInputs = old.nativeBuildInputs ++ [final.pcre final.gnugrep.pcre2 final.libpcre]; - # buildInputs = old.buildInputs ++ [final.pcre]; - # }); + picom = prev.picom.overrideAttrs (old: { + src = prev.fetchFromGitHub { + repo = "picom"; + owner = "dccsillag"; + rev = "51b21355696add83f39ccdb8dd82ff5009ba0ae5"; + sha256 = "sha256-crCwRJd859DCIC0pEerpDqdX2j8ZrNAzVaSSB3mTPN8=="; + }; + nativeBuildInputs = old.nativeBuildInputs ++ [final.pcre final.gnugrep.pcre2 final.asciidoc]; + buildInputs = old.buildInputs ++ [final.pcre]; + nativeInstallCheckInputs = []; + doCheck = false; + dontCheck = true; + }); expressvpn = prev.expressvpn.overrideAttrs (_: { src = prev.fetchurl {