From 7e98036dd1550317be7c3f98ec87476eec26233b Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Thu, 26 Sep 2024 10:10:27 +0300 Subject: [PATCH] Nix: add hw-s, bump flake --- flake.lock | 36 ++++++++++++++++++++++++++++++------ flake.nix | 7 +++++++ nix/default.nix | 2 ++ 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5abff22..9b970f7 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", "type": "github" }, "original": { @@ -23,13 +23,36 @@ "type": "github" } }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { @@ -42,6 +65,7 @@ "root": { "inputs": { "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "systems": "systems" } diff --git a/flake.nix b/flake.nix index a246760..601a5b9 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,12 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "systems"; }; + + hyprwayland-scanner = { + url = "github:hyprwm/hyprwayland-scanner"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; + }; }; outputs = { @@ -36,6 +42,7 @@ default = self.overlays.hyprpicker; hyprpicker = lib.composeManyExtensions [ inputs.hyprutils.overlays.default + inputs.hyprwayland-scanner.overlays.default (final: prev: { hyprpicker = prev.callPackage ./nix/default.nix { stdenv = prev.gcc13Stdenv; diff --git a/nix/default.nix b/nix/default.nix index 0e64f6d..4ba945e 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -6,6 +6,7 @@ cairo, fribidi, hyprutils, + hyprwayland-scanner, libdatrie, libGL, libjpeg, @@ -37,6 +38,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake + hyprwayland-scanner pkg-config ];