TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-09-11 23:11:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

nix(chore): set nixpkgs to nixos-26.05, update flake.lock (#495)

Browse Source 
fixes #492
Co-authored-by: KristijanZic <kristijan.zic@10x.engineering>
This commit is contained in:
onelock
2026-09-07 08:15:09 +01:00
committed by GitHub
parent 6b1eddef7a
commit 00c5eee8d8
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock generated
View File

@@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1772963539, "lastModified": 1788405554,
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "narHash": "sha256-r2f1oUwixlgq9zOdYLqJLfS/lWBT60/IITjhTKI59JU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "rev": "a5cc6f2c37bf518436dc8d1c288ccd0c43c2f4c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773025773, "lastModified": 1788505699,
"narHash": "sha256-Wik8+xApNfldpUFjPmJkPdg0RrvUPSWGIZis+A/0N1w=", "narHash": "sha256-PSPDCdbEBEbSDCWcqv5GkbyD2ACQ9Diz6vmEbWdy4dM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3c06fdbbd36ff60386a1e590ee0cd52dcd1892bf", "rev": "9eccf73c5b810052f08aa77ae0548c383259f17f",
"type": "github" "type": "github"
}, },
"original": { "original": {

24
flake.nix
View File

@@ -1,7 +1,8 @@
{ {
description = "Nix Flake for lan-mouse"; description = "Nix Flake for lan-mouse";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # 26.05 used here to keep allowing builds on x86_64-darwin, bump this to unstable once they deprecate 26.05
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -30,7 +31,24 @@
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ rust-overlay.overlays.default ]; overlays = [
rust-overlay.overlays.default
#NOTE: appstream's meson build injects the literal string
# "none required" into linker flags on 'aarch64-darwin', causing clang to fail.
# remove this overlay once we bump nixpkgs to unstable branch
(
final: prev:
lib.optionalAttrs prev.stdenv.hostPlatform.isDarwin {
appstream = prev.appstream.overrideAttrs (old: {
postConfigure = (old.postConfigure or "") + ''
substituteInPlace build.ninja \
--replace-fail "none required" ""
'';
});
}
)
];
}; };
# Default toolchain for devshell # Default toolchain for devshell
rustToolchain = pkgs.rust-bin.stable.latest.default.override { rustToolchain = pkgs.rust-bin.stable.latest.default.override {
@@ -80,7 +98,7 @@
libadwaita libadwaita
librsvg librsvg
] ]
++ lib.optionals pkgs.stdenv.isLinux [ ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
libX11 libX11
libXtst libXtst
]; ];

2
nix/default.nix
View File

@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage {
libadwaita libadwaita
librsvg librsvg
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
libX11 libX11
libXtst libXtst
]; ];

4
nix/hm-module.nix
View File

@@ -23,12 +23,12 @@ in {
}; };
systemd = mkOption { systemd = mkOption {
type = types.bool; type = types.bool;
default = pkgs.stdenv.isLinux; default = pkgs.stdenv.hostPlatform.isLinux;
description = "Whether to enable to systemd service for lan-mouse on linux."; description = "Whether to enable to systemd service for lan-mouse on linux.";
}; };
launchd = mkOption { launchd = mkOption {
type = types.bool; type = types.bool;
default = pkgs.stdenv.isDarwin; default = pkgs.stdenv.hostPlatform.isDarwin;
description = "Whether to enable to launchd service for lan-mouse on macOS."; description = "Whether to enable to launchd service for lan-mouse on macOS.";
}; };
settings = lib.mkOption { settings = lib.mkOption {