sfml: 2.5.1 -> 2.6.1; csfml: 2.5.2 -> 2.6.1

[drawbu]

Description of changes

• Just updated the packages
• Moved to by name
• Reformat with nixfmt-rfc-style

Works fine on a few projects of mine on x86_64-linux
Managed to get it working on x86_64-darwin

CSFML & SFML packages don't get a lot of updates on the nixpkgs. I might add myself as a maintainer if we don't get a reply shortly

I also had to patch pkgconfig path in the cmake as it is broken upstream. A or fixes the issue for SFML package and I replicated the patch for CSFML.

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[drawbu]

@ofborg build sfml csfml

[drawbu]

Result of nixpkgs-review pr 312161 run on x86_64-darwin 1

3 packages marked as broken and skipped:

• dolphin-emu-primehack
• libretro.dolphin
• retroarchFull

9 packages built:

• antsimulator
• cutecapture
• dolphin-emu
• openrw
• python311Packages.nocturne
• python311Packages.nocturne.dist
• python312Packages.nocturne
• python312Packages.nocturne.dist
• sfml

[drawbu]

Result of nixpkgs-review pr 312161 run on x86_64-linux 1

1 package marked as broken and skipped:

• shadered

25 packages built:

• EmptyEpsilon
• antsimulator
• attract-mode
• csfml
• cutecapture
• dolphin-emu
• dolphin-emu-primehack
• extremetuxracer
• guvcview
• libretro.dolphin
• lutris
• lutris-free
• marble-marcher-ce
• mars
• opendungeons
• openrw
• python311Packages.nocturne
• python311Packages.nocturne.dist
• python312Packages.nocturne
• python312Packages.nocturne.dist
• qstopmotion
• retroarchFull
• sfml
• simplenes
• vbam

[drawbu]

pkg-config is broken upsream.
See SFML/SFML#2835

[Sigmanificient]

When building the csfml package without the patches, nix gives the following error:

Broken paths found in a .pc file! /nix/store/g230r8pdkgzfwjn7a2c9r7vapidg2dkg-csfml-2.6.1/lib/pkgconfig/csfml-network.pc
The following lines have issues (specifically '//' in paths).
3:libdir=${exec_prefix}//nix/store/g230r8pdkgzfwjn7a2c9r7vapidg2dkg-csfml-2.6.1/lib
It is very likely that paths are being joined improperly.
ex: "${prefix}/@CMAKE_INSTALL_LIBDIR@" should be "@CMAKE_INSTALL_FULL_LIBDIR@"
Please see https://github.com/NixOS/nixpkgs/issues/144170 for more details.

Following nix advise, I tried to build with these changes:

--- a/pkgs/by-name/cs/csfml/package.nix    2024-05-21 09:41:18.068576345 +0200
+++ b/pkgs/by-name/cs/csfml/package.nix    2024-05-21 09:40:58.865882958 +0200
@@ -20,7 +20,11 @@
   nativeBuildInputs = [ cmake ];
   buildInputs = [ sfml ];
   cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ];
-  patches = [ ./pkgconfig.patch ];
+
+  prePatch = ''
+   substituteInPlace tools/pkg-config/* \
+     --replace-fail 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' "libdir=@CMAKE_INSTALL_FULL_LIBDIR@"
+  '';
 
   meta = {
     homepage = "https://www.sfml-dev.org/";

It produces a valid pkg-config file:

[drawbu]

dev out change broke csfml. Currently trying to fix the issue

[drawbu]

Removing multiple outputs as it is broken right now for SFML/CSFML

[drawbu]

@ofborg build sfml csfml

[drawbu]

When the build ends, the pr should be good to go. Waiting for review by maintainers

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3979

[drawbu]

fixed merge conflict with e0464e4

[drawbu]

One this pr is good to go, i will squash all that mess

[drawbu]

When my PR gets merged upstream in the CSFML repo, all patches can be deleted when the 3.0.0 (works for the moment at least)