From 93d3caa7450cc5f44b63f1a495b755d43fe16576 Mon Sep 17 00:00:00 2001 From: tonybanters Date: Sat, 16 May 2026 20:55:18 -0700 Subject: [PATCH 1/2] oxwm: vendor lua zon dependency --- pkgs/by-name/ox/oxwm/build.zig.zon.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 pkgs/by-name/ox/oxwm/build.zig.zon.nix diff --git a/pkgs/by-name/ox/oxwm/build.zig.zon.nix b/pkgs/by-name/ox/oxwm/build.zig.zon.nix new file mode 100644 index 000000000000..edd9caf9961c --- /dev/null +++ b/pkgs/by-name/ox/oxwm/build.zig.zon.nix @@ -0,0 +1,17 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ + linkFarm, + fetchzip, + fetchgit, +}: + +linkFarm "zig-packages" [ + { + name = "N-V-__8AAKEzFAAA695b9LXBhUSVK5MAV_VKSm1mEj3Acbze"; + path = fetchzip { + url = "https://www.lua.org/ftp/lua-5.4.8.tar.gz"; + hash = "sha256-6TMsVp2D3WtvnwyhvwodjQH3kvTXz1rSMWwiHazvKys="; + }; + } +] From 81198bd2940150cde90cc44349a59a804f26aeed Mon Sep 17 00:00:00 2001 From: tonybanters Date: Sat, 16 May 2026 20:55:48 -0700 Subject: [PATCH 2/2] oxwm: 0.11.3 -> 0.12.0 --- pkgs/by-name/ox/oxwm/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ox/oxwm/package.nix b/pkgs/by-name/ox/oxwm/package.nix index c6872949943b..aa3d944000aa 100644 --- a/pkgs/by-name/ox/oxwm/package.nix +++ b/pkgs/by-name/ox/oxwm/package.nix @@ -1,8 +1,9 @@ { lib, stdenv, + callPackage, fetchFromGitHub, - zig_0_15, + zig_0_16, pkg-config, libx11, libxft, @@ -14,17 +15,24 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "oxwm"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "tonybanters"; repo = "oxwm"; tag = "v${finalAttrs.version}"; - hash = "sha256-W6muqajSk9UR646ZmLkx/wWfiaWLo+d1lJMiLm82NC8="; + hash = "sha256-N0uKA51AR0YFUcp6MdIiJS5HtHobSaDdXPRrMEOCSEM="; }; + deps = callPackage ./build.zig.zon.nix { }; + + zigBuildFlags = [ + "--system" + "${finalAttrs.deps}" + ]; + nativeBuildInputs = [ - zig_0_15.hook + zig_0_16.hook pkg-config ];