Skip to content

Commit

Permalink
Nix: add hyprutils dep
Browse files Browse the repository at this point in the history
  • Loading branch information
fufexan committed Jun 8, 2024
1 parent 28be080 commit 7aabab4
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 12 deletions.
30 changes: 27 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 18 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
systems.url = "github:nix-systems/default-linux";

hyprutils = {
url = "github:hyprwm/hyprutils";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
};

outputs = {
self,
nixpkgs,
systems,
}: let
...
} @ inputs: let
inherit (nixpkgs) lib;
eachSystem = lib.genAttrs (import systems);
pkgsFor = eachSystem (system:
Expand All @@ -26,13 +33,16 @@
in {
overlays = {
default = self.overlays.hyprlang;
hyprlang = final: prev: {
hyprlang = final.callPackage ./nix/default.nix {
stdenv = final.gcc13Stdenv;
version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
};
hyprlang-with-tests = final.hyprlang.override {doCheck = true;};
};
hyprlang = lib.composeManyExtensions [
inputs.hyprutils.overlays.default
(final: prev: {
hyprlang = final.callPackage ./nix/default.nix {
stdenv = final.gcc13Stdenv;
version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
};
hyprlang-with-tests = final.hyprlang.override {doCheck = true;};
})
];
};

packages = eachSystem (system: {
Expand Down
9 changes: 8 additions & 1 deletion nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
lib,
stdenv,
cmake,
hyprutils,
pkg-config,
version ? "git",
doCheck ? false,
}:
Expand All @@ -10,7 +12,12 @@ stdenv.mkDerivation {
inherit version doCheck;
src = ../.;

nativeBuildInputs = [cmake];
nativeBuildInputs = [
cmake
pkg-config
];

buildInputs = [hyprutils];

outputs = ["out" "dev"];

Expand Down

0 comments on commit 7aabab4

Please sign in to comment.