diff --git a/overlays/default.nix b/overlays/default.nix index 22c3ec9f8..40fae0e92 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -83,7 +83,7 @@ in alacritty_git = callOverride ../pkgs/alacritty-git { }; - ananicy-cpp-rules = final.callPackage ../pkgs/ananicy-cpp-rules { }; + ananicy-rules-cachyos_git = callOverride ../pkgs/ananicy-cpp-rules { }; applet-window-title = final.callPackage ../pkgs/applet-window-title { }; diff --git a/pkgs/ananicy-cpp-rules/default.nix b/pkgs/ananicy-cpp-rules/default.nix index 6572c30ef..0d2963160 100644 --- a/pkgs/ananicy-cpp-rules/default.nix +++ b/pkgs/ananicy-cpp-rules/default.nix @@ -1,43 +1,14 @@ -{ lib -, stdenvNoCC -, callPackage -, fetchFromGitHub -, ... -}: -let - current = lib.trivial.importJSON ./version.json; -in -stdenvNoCC.mkDerivation rec { - pname = "ananicy-cpp-rules"; - inherit (current) version; +{ prev, gitOverride, ... }: - src = fetchFromGitHub { - inherit (current) rev hash; +gitOverride { + nyxKey = "ananicy-rules-cachyos"; + prev = prev.ananicy-rules-cachyos; + + versionNyxPath = "pkgs/ananicy-cpp-rules/version.json"; + fetcher = "fetchFromGitHub"; + fetcherData = { owner = "CachyOS"; repo = "ananicy-rules"; }; - - installPhase = '' - runHook preInstall - mkdir -p $out/etc/ananicy.d - rm README.md LICENSE - cp -r * $out/etc/ananicy.d - runHook postInstall - ''; - - passthru.updateScript = callPackage ../../shared/git-update.nix { - inherit pname; - nyxKey = "ananicy-cpp-rules"; - versionPath = "pkgs/ananicy-cpp-rules/version.json"; - fetchLatestRev = callPackage ../../shared/github-rev-fetcher.nix { } "master" src; - gitUrl = src.gitRepoUrl; - }; - - meta = with lib; { - description = "CachyOS' ananicy-rules meant to be used with ananicy-cpp"; - homepage = "https://github.com/CachyOS/ananicy-rules"; - license = licenses.gpl3; - maintainers = [ maintainers.dr460nf1r3 ]; - platforms = platforms.all; - }; + ref = "master"; }