From 79dc80a5bc5c03a8e2cccd2674362c25b4708874 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Wed, 8 Oct 2025 13:49:09 +0400 Subject: [PATCH] oculante: Fix broken build Build break was introduced by the move to Cmake4. However, the offending package (glsl-to-spriv) has been deprecated and replaced by shaderc. So use the HEAD of the master branch to pull in this latest version. A issue has been raised upstream to tag a new official release. Signed-off-by: Brian McGillion --- pkgs/by-name/oc/oculante/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index de5883e8d0e1..3341277459ad 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -17,21 +17,24 @@ stdenv, gtk3, perl, + shaderc, wrapGAppsHook3, }: rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.9.2"; + version = "0.9.2.1-unstable-2025-10-08"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; - rev = version; - hash = "sha256-3kDrsD24/TNcA7NkwwCHN4ez1bC5MP7g28H3jaO/M7E="; + rev = "51b9f70b35e09850baee85971720b8d3ac49c80b"; + hash = "sha256-YTrUucO1Fq2TgnV/HHkx2fcHvBupeoMpiBSwqIvyHaQ="; }; - cargoHash = "sha256-lksAPT1nuwN5bh3x7+EN4B8ksGtvemt4tbm6/3gqdgE="; + cargoHash = "sha256-Bn2HxmFiqOeb3oUnUL/K0SahcFWRlY9RrbGU4orQz+Y="; + + SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; nativeBuildInputs = [ cmake @@ -44,6 +47,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl fontconfig + shaderc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL