sfml: 2.5.1 -> 2.6.1; csfml: 2.5.2 -> 2.6.0 #312161
Open
+131
−87
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
Sigmanificient
suggested changes
May 16, 2024
Sigmanificient
suggested changes
May 16, 2024
|
@ofborg build sfml csfml |
Co-authored-by: Yohann Boniface <edhyjox@gmail.com>
Co-authored-by: Sigmanificient <edhyjox@gmail.com>
Co-authored-by: Sigmanificient <edhyjox@gmail.com>
Sigmanificient
approved these changes
May 17, 2024
|
Result of 3 packages marked as broken and skipped:
9 packages built:
|
|
Result of 1 package marked as broken and skipped:
25 packages built:
|
|
pkg-config is broken upsream. |
|
When building the 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
|
Sigmanificient
suggested changes
May 21, 2024
|
dev out change broke csfml. Currently trying to fix the issue |
|
Removing multiple outputs as it is broken right now for SFML/CSFML |
Co-authored-by: Yohann Boniface <edhyjox@gmail.com>
|
@ofborg build sfml csfml |
|
When the build ends, the pr should be good to go. Waiting for review by maintainers |
|
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 |
Sigmanificient
approved these changes
May 23, 2024
|
We still have no answer from the maintainers of both sfml and csfml after 3 weeks. I'm adding myself as maintainer |
| meta = with lib; { | ||
| prePatch = '' | ||
| substituteInPlace tools/pkg-config/* \ | ||
| --replace-fail 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' "libdir=@CMAKE_INSTALL_FULL_LIBDIR@" |
There was a problem hiding this comment.
Please try to upstream this
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Works fine on a few projects of mine on
x86_64-linuxManaged to get it working on
x86_64-darwinCSFML & 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
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.