hyprwm/hyprland-qtutils
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprland-qtutils.git synced 2025-01-29 06:19:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nix: move to hyprland-qt-support (#7)
Some checks failed
Build / nix (push) Has been cancelled
Details

Browse source
This commit is contained in:
outfoxxed 2025-01-08 15:17:52 -08:00 committed by GitHub
parent 196e043cd9
commit 8c9483a21f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 72 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
flake.lock
View file

@ -1,5 +1,28 @@
{ {
"nodes": { "nodes": {
"hyprland-qt-support": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1736376766,
"narHash": "sha256-tZG+mkJJzqoi/gH8nN6P/yY1/PEYtom9+2WdYKKv5YM=",
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"rev": "0ecf224f213497c45b12c4dc7bdc2c2edd0e3084",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"type": "github"
}
},
"hyprutils": { "hyprutils": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -10,11 +33,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734796073, "lastModified": 1736164519,
"narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", "rev": "3c895da64b0eb19870142196fa48c07090b441c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -25,11 +48,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1736012469,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,6 +64,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems" "systems": "systems"

13
flake.nix
View file

@ -10,6 +10,12 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
}; };
hyprland-qt-support = {
url = "github:hyprwm/hyprland-qt-support";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
}; };
outputs = { outputs = {
@ -34,5 +40,12 @@
default = self.packages.${system}.hyprland-qtutils; default = self.packages.${system}.hyprland-qtutils;
inherit (pkgsFor.${system}) hyprland-qtutils; inherit (pkgsFor.${system}) hyprland-qtutils;
}); });
devShells = eachSystem (system: {
default = import ./nix/shell.nix {
pkgs = pkgsFor.${system};
inherit (pkgsFor.${system}) hyprland-qtutils;
};
});
}; };
} }

2
nix/default.nix
View file

@ -4,6 +4,7 @@
cmake, cmake,
pkg-config, pkg-config,
hyprutils, hyprutils,
hyprland-qt-support,
pciutils, pciutils,
qt6, qt6,
version ? "0", version ? "0",
@ -31,6 +32,7 @@ in
buildInputs = [ buildInputs = [
hyprutils hyprutils
hyprland-qt-support
qt6.qtbase qt6.qtbase
qt6.qtsvg qt6.qtsvg
qt6.qtwayland qt6.qtwayland

1
nix/overlays.nix
View file

@ -15,6 +15,7 @@ in {
hyprland-qtutils = lib.composeManyExtensions [ hyprland-qtutils = lib.composeManyExtensions [
inputs.hyprutils.overlays.default inputs.hyprutils.overlays.default
inputs.hyprland-qt-support.overlays.default
(final: prev: { (final: prev: {
hyprland-qtutils = final.callPackage ./. { hyprland-qtutils = final.callPackage ./. {
stdenv = final.gcc14Stdenv; stdenv = final.gcc14Stdenv;

26
nix/shell.nix Normal file
View file

@ -0,0 +1,26 @@
{
pkgs ? import <nixpkgs> {},
hyprland-qtutils ? pkgs.callPackage ./default.nix {},
...
}: pkgs.mkShell {
inputsFrom = [ hyprland-qtutils ];
nativeBuildInputs = [ pkgs.clang-tools pkgs.pciutils ];
shellHook = let
inherit (pkgs.lib.strings) concatMapStringsSep;
qtLibPath = f: concatMapStringsSep ":" f (with pkgs.qt6; [
qtbase
qtdeclarative
qtwayland
pkgs.hyprland-qt-support
]);
in ''
# Add Qt-related environment variables.
export QT_PLUGIN_PATH=${qtLibPath (p: "${p}/lib/qt-6/plugins")}
export QML2_IMPORT_PATH=${qtLibPath (p: "${p}/lib/qt-6/qml")}
# Generate compile_commands.json
CMAKE_EXPORT_COMPILE_COMMANDS=1 cmake -S . -B ./build
ln -s build/compile_commands.json .
'';
}