Skip to content

Commit

Permalink
Nix: add hyprutils dep
Browse files Browse the repository at this point in the history
flake.lock: update
  • Loading branch information
fufexan committed Jul 16, 2024
1 parent 9b04302 commit b1137a6
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 45 deletions.
55 changes: 26 additions & 29 deletions flake.lock

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

36 changes: 24 additions & 12 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,20 @@

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
systems.url = "github:nix-systems/default-linux";

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

systems.url = "github:nix-systems/default-linux";
hyprlang = {
url = "github:hyprwm/hyprlang";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
inputs.hyprutils.follows = "hyprutils";
};
};

outputs = {
Expand All @@ -31,16 +41,18 @@
in {
overlays = {
default = self.overlays.hyprpaper;
hyprpaper = final: prev: rec {
hyprpaper = final.callPackage ./nix/default.nix {
stdenv = final.gcc13Stdenv;
version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
commit = self.rev or "";
inherit (final.xorg) libXdmcp;
inherit (inputs.hyprlang.packages.${final.system}) hyprlang;
};
hyprpaper-debug = hyprpaper.override {debug = true;};
};
hyprpaper = lib.composeManyExtensions [
inputs.hyprlang.overlays.default
inputs.hyprutils.overlays.default
(final: prev: rec {
hyprpaper = final.callPackage ./nix/default.nix {
stdenv = final.gcc13Stdenv;
version = "0.7.0" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
commit = self.rev or "";
};
hyprpaper-debug = hyprpaper.override {debug = true;};
})
];
};

packages = eachSystem (system: {
Expand Down
10 changes: 6 additions & 4 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
file,
fribidi,
hyprlang,
hyprutils,
libdatrie,
libGL,
libjpeg,
Expand All @@ -22,7 +23,7 @@
wayland,
wayland-protocols,
wayland-scanner,
libXdmcp,
xorg,
commit,
debug ? false,
version ? "git",
Expand Down Expand Up @@ -54,6 +55,7 @@ stdenv.mkDerivation {
file
fribidi
hyprlang
hyprutils
libdatrie
libGL
libjpeg
Expand All @@ -67,15 +69,15 @@ stdenv.mkDerivation {
wayland
wayland-protocols
wayland-scanner
libXdmcp
xorg.libXdmcp
util-linux
];

meta = with lib; {
homepage = "https://github.com/hyprwm/hyprpaper";
description = "A blazing fast wayland wallpaper utility with IPC controls";
homepage = "https://github.com/hyprwm/hyprpaper";
license = licenses.bsd3;
platforms = platforms.linux;
mainProgram = "hyprpaper";
platforms = platforms.linux;
};
}

0 comments on commit b1137a6

Please sign in to comment.