nix: move to hyprland-qt-support (#13)

This commit is contained in:
outfoxxed 2025-01-08 14:38:20 -08:00 committed by GitHub
parent 5351581605
commit 54ce0e6243
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 40 additions and 12 deletions

View file

@ -1,5 +1,28 @@
{
"nodes": {
"hyprland-qt-support": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1736374981,
"narHash": "sha256-DI/ZjoOIpKiZSLxAZ406bon68jtfKMlkNrmOSqi86lU=",
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"rev": "d4615b8e40dcdfc11b6020d3e022f8744843a9f8",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
@ -10,11 +33,11 @@
]
},
"locked": {
"lastModified": 1727300645,
"narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
"lastModified": 1736164519,
"narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
"rev": "3c895da64b0eb19870142196fa48c07090b441c4",
"type": "github"
},
"original": {
@ -25,11 +48,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"lastModified": 1736012469,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github"
},
"original": {
@ -41,6 +64,7 @@
},
"root": {
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprutils": "hyprutils",
"nixpkgs": "nixpkgs",
"systems": "systems"

View file

@ -10,6 +10,12 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
hyprland-qt-support = {
url = "github:hyprwm/hyprland-qt-support";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
};
outputs = {

View file

@ -8,7 +8,7 @@
pkg-config,
hyprutils,
pciutils,
kdePackages,
hyprland-qt-support,
version ? "0",
}: let
inherit (lib.strings) makeBinPath;
@ -31,8 +31,7 @@ in
qt6.qtsvg
qt6.qtwayland
hyprutils
kdePackages.qqc2-desktop-style
kdePackages.kirigami
hyprland-qt-support
];
preFixup = ''

View file

@ -15,6 +15,7 @@ in {
hyprsysteminfo = lib.composeManyExtensions [
inputs.hyprutils.overlays.default
inputs.hyprland-qt-support.overlays.default
(final: prev: {
hyprsysteminfo = final.callPackage ./. {
version = "${version}+date=${date}_${self.shortRev or "dirty"}";

View file

@ -12,9 +12,7 @@
qtbase
qtdeclarative
qtwayland
pkgs.kdePackages.qqc2-desktop-style
# see https://github.com/NixOS/nixpkgs/blob/e186dd1a34be7a76c6e2c038ab4b759faec32d5d/pkgs/kde/frameworks/kirigami/default.nix#L9-L11
pkgs.kdePackages.kirigami.unwrapped
pkgs.hyprland-qt-support
]);
in ''
# Add Qt-related environment variables.