From 48cdf8bf852234ea3dad8dad3d571bb1d9546c32 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 10 Mar 2026 03:26:40 +0900 Subject: go: 1.26 Signed-off-by: Ophestra --- package.nix | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'package.nix') diff --git a/package.nix b/package.nix index 099d2425..68e3b2cd 100644 --- a/package.nix +++ b/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - buildGoModule, + buildGo126Module, makeBinaryWrapper, xdg-dbus-proxy, pkg-config, @@ -17,7 +17,7 @@ fuse3, # for passthru.buildInputs - go, + go_1_26, clang, # for check @@ -28,7 +28,7 @@ withStatic ? stdenv.hostPlatform.isStatic, }: -buildGoModule rec { +buildGo126Module rec { pname = "hakurei"; version = "0.3.6"; @@ -51,7 +51,7 @@ buildGoModule rec { ]; nativeBuildInputs = [ - go + go_1_26 pkg-config wayland-scanner ]; @@ -125,16 +125,20 @@ buildGoModule rec { --inherit-argv0 --prefix PATH : ${lib.makeBinPath appPackages} ''; - passthru.targetPkgs = [ - go - clang - xorg.xorgproto - util-linux + passthru = { + go = go_1_26; - # for go generate - wayland-protocols - wayland-scanner - ] - ++ buildInputs - ++ nativeBuildInputs; + targetPkgs = [ + go_1_26 + clang + xorg.xorgproto + util-linux + + # for go generate + wayland-protocols + wayland-scanner + ] + ++ buildInputs + ++ nativeBuildInputs; + }; } -- cgit v1.3.1