diff --git a/flake.lock b/flake.lock index b973b60..eeb7d54 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1755835412, - "narHash": "sha256-RzTBJ5ERXrJk7JPIDp1vjUNMKka6tyg4RctIR3cxqsM=", + "lastModified": 1787457768, + "narHash": "sha256-cbgeu5NTb6DtB+tNs4E6z6K/1XKKM90gVmlkWMJe+gY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "56254103ed36317cf471da3c93ac13805c72a7fa", + "rev": "25cfc8fdc413d73b3a47e3e86dafcad51cf5c9f9", "type": "gitlab" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1755810213, - "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", + "lastModified": 1787487906, + "narHash": "sha256-zIdM+8teujHm5hc5MIPDnV7k2UeOOT/pFyFtWjOCwsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", + "rev": "cfba7ad5886b342b8dd63ba74354b3853ea4cfc9", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1755607423, - "narHash": "sha256-XWzjp77whLmki/pe1NRHKXsj/NwDcyZe6QPMMfv2g1c=", + "lastModified": 1787539381, + "narHash": "sha256-e8vhxuSYAa+/QEnz0m5Dxdot7J0sb1VrjUInY2yUeg0=", "owner": "illustris", "repo": "flake", - "rev": "270fbbc33443da18ee4ccd09801f9ce4bc99cfb1", + "rev": "842f2aa7d9a5904222630bbfe2e97055526faa6d", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1753853405, - "narHash": "sha256-FDWuoxn5Ke4cZgX3IH6nze3da1FKy+f7fw3trxkuN84=", + "lastModified": 1775797235, + "narHash": "sha256-jcYMhsbmFOMMP2Vhv0jb/u/iCBW6XT1L2LLUVUPx94o=", "owner": "illustris", "repo": "nixfs", - "rev": "02fca4ccce6dda293fd0542b82747531185852af", + "rev": "086e395c9e0e6b51e70a7c406a06e84e8a0805dd", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1787360063, + "narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bd6b154..cf84ab0 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; illustris = { - url = "github:illustris/flake"; # url = "path:///home/illustris/src/flake"; + url = "github:illustris/flake"; inputs = { nixpkgs.follows = "nixpkgs"; firefox-addons.follows = "firefox-addons"; @@ -43,6 +43,35 @@ lib pkgs suckless + ] ++ [ + # TODO: drop when nixpkgs ships wacomtablet's dependency metadata + # (missing from pkgs/kde/generated/dependencies.json as of 2c423e0) + (final: prev: { + kdePackages = prev.kdePackages.overrideScope (kf: kp: { + wacomtablet = kp.wacomtablet.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ kf.extra-cmake-modules ]; + buildInputs = (old.buildInputs or [ ]) ++ (with kf; [ + kcmutils + kconfig + kcoreaddons + kdbusaddons + kdoctools + kglobalaccel + ki18n + kio + knotifications + kwidgetsaddons + kwindowsystem + kxmlgui + libplasma + plasma5support + ]) ++ [ + final.libX11 + final.libxcb + ]; + }); + }); + }) ]; } home-manager.nixosModules.default