hyprwm/hyprpaper
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprpaper.git synced 2024-11-16 22:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Nix: add hyprutils dep

Browse source 
flake.lock: update
This commit is contained in:
Mihai Fufezan 2024-07-16 22:51:25 +03:00
parent 6a0999e359
commit d4f50358ad
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
3 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
flake.lock
View file

@ -2,8 +2,12 @@
"nodes": { "nodes": {
"hyprlang": { "hyprlang": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": [
"systems": "systems" "nixpkgs"
],
"systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1713121246, "lastModified": 1713121246,
@ -19,23 +23,30 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "hyprutils": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": { "locked": {
"lastModified": 1708475490, "lastModified": 1721071737,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=",
"owner": "NixOS", "owner": "hyprwm",
"repo": "nixpkgs", "repo": "hyprutils",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260", "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "hyprwm",
"ref": "nixos-unstable", "repo": "hyprutils",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
@ -54,8 +65,9 @@
"root": { "root": {
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_2", "hyprutils": "hyprutils",
"systems": "systems_2" "nixpkgs": "nixpkgs",
"systems": "systems"
} }
}, },
"systems": { "systems": {
@ -72,21 +84,6 @@
"repo": "default-linux", "repo": "default-linux",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

28
flake.nix
View file

@ -3,10 +3,20 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
hyprlang.url = "github:hyprwm/hyprlang";
systems.url = "github:nix-systems/default-linux"; systems.url = "github:nix-systems/default-linux";
hyprutils = {
url = "github:hyprwm/hyprutils";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
hyprlang = {
url = "github:hyprwm/hyprlang";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
inputs.hyprutils.follows = "hyprutils";
};
}; };
outputs = { outputs = {
@ -31,16 +41,18 @@
in { in {
overlays = { overlays = {
default = self.overlays.hyprpaper; default = self.overlays.hyprpaper;
hyprpaper = final: prev: rec { hyprpaper = lib.composeManyExtensions [
inputs.hyprlang.overlays.default
inputs.hyprutils.overlays.default
(final: prev: rec {
hyprpaper = final.callPackage ./nix/default.nix { hyprpaper = final.callPackage ./nix/default.nix {
stdenv = final.gcc13Stdenv; stdenv = final.gcc13Stdenv;
version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); version = "0.7.0" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
commit = self.rev or ""; commit = self.rev or "";
inherit (final.xorg) libXdmcp;
inherit (inputs.hyprlang.packages.${final.system}) hyprlang;
}; };
hyprpaper-debug = hyprpaper.override {debug = true;}; hyprpaper-debug = hyprpaper.override {debug = true;};
}; })
];
}; };
packages = eachSystem (system: { packages = eachSystem (system: {

10
nix/default.nix
View file

@ -8,6 +8,7 @@
file, file,
fribidi, fribidi,
hyprlang, hyprlang,
hyprutils,
libdatrie, libdatrie,
libGL, libGL,
libjpeg, libjpeg,
@ -22,7 +23,7 @@
wayland, wayland,
wayland-protocols, wayland-protocols,
wayland-scanner, wayland-scanner,
libXdmcp, xorg,
commit, commit,
debug ? false, debug ? false,
version ? "git", version ? "git",
@ -54,6 +55,7 @@ stdenv.mkDerivation {
file file
fribidi fribidi
hyprlang hyprlang
hyprutils
libdatrie libdatrie
libGL libGL
libjpeg libjpeg
@ -67,15 +69,15 @@ stdenv.mkDerivation {
wayland wayland
wayland-protocols wayland-protocols
wayland-scanner wayland-scanner
libXdmcp xorg.libXdmcp
util-linux util-linux
]; ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/hyprwm/hyprpaper";
description = "A blazing fast wayland wallpaper utility with IPC controls"; description = "A blazing fast wayland wallpaper utility with IPC controls";
homepage = "https://github.com/hyprwm/hyprpaper";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux;
mainProgram = "hyprpaper"; mainProgram = "hyprpaper";
platforms = platforms.linux;
}; };
} }