From 79d0da523b61333cd722b4e11121978f8a775b2b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Mar 2025 23:40:01 +0100 Subject: [PATCH] csfml: 2.5.2 -> 2.6.1 Diff: https://github.com/SFML/CSFML/compare/2.5.2...2.6.1 --- pkgs/by-name/cs/csfml/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cs/csfml/package.nix b/pkgs/by-name/cs/csfml/package.nix index 08d98928d77e..63bae5a8f474 100644 --- a/pkgs/by-name/cs/csfml/package.nix +++ b/pkgs/by-name/cs/csfml/package.nix @@ -8,13 +8,23 @@ stdenv.mkDerivation rec { pname = "csfml"; - version = "2.5.2"; + version = "2.6.1"; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; rev = version; - sha256 = "sha256-A5C/4SnxUX7mW1wkPWJWX3dwMhrJ79DkBuZ7UYzTOqE="; + sha256 = "sha256-ECt0ySDpYWF0zuDBSnQzDwUm4Xj4z1+XSC55D6yivac="; }; + + # Fix incorrect path joining in cmake + # https://github.com/NixOS/nixpkgs/issues/144170 + postPatch = '' + substituteInPlace tools/pkg-config/csfml-*.pc.in \ + --replace-fail \ + 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' \ + "libdir=@CMAKE_INSTALL_FULL_LIBDIR@" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ sfml ]; cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ];