Skip to content

Conversation

socksy
Copy link
Contributor

@socksy socksy commented Jun 27, 2024

Description of changes

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:
  • 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.11 Release Notes (or backporting 23.11 and 24.05 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.

@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Jun 27, 2024
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 27, 2024
@nixos-discourse
Copy link

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/4271

Comment on lines 69 to 97
patchPhase = ''
sed -i 's|''${SKIA_SRC}/bin/gn)|${gn}/bin/gn)|' src/engine/CMakeLists.txt
sed -i 's|fontconfig|${fontconfig.lib}/lib/libfontconfig.so|' src/cmake/friction-common.cmake
grep -rl 'hb' | xargs sed -Ei 's/(["<])(hb.*\.h)/\1harfbuzz\/\2/'
'';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
patchPhase = ''
sed -i 's|''${SKIA_SRC}/bin/gn)|${gn}/bin/gn)|' src/engine/CMakeLists.txt
sed -i 's|fontconfig|${fontconfig.lib}/lib/libfontconfig.so|' src/cmake/friction-common.cmake
grep -rl 'hb' | xargs sed -Ei 's/(["<])(hb.*\.h)/\1harfbuzz\/\2/'
'';
postPatch = ''
sed -i 's|''${SKIA_SRC}/bin/gn)|${gn}/bin/gn)|' src/engine/CMakeLists.txt
sed -i 's|fontconfig|${fontconfig.lib}/lib/libfontconfig.so|' src/cmake/friction-common.cmake
grep -rl 'hb' | xargs sed -Ei 's/(["<])(hb.*\.h)/\1harfbuzz\/\2/'
'';

postPatch is usually placed right after src.
Also please use subtituteInPlace with --replace-fail if possbible so that we easily notice when things no longer match

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't work out if the last one was possible to change to substituteInPlace. It's replacing all #include <hb.h> and #include "hb.h" to #include <harfbuzz/hb.h>, since it seems this is where the harfbuzz that's how to get the header in harfbuzzFull. I'm not sure if it's too bad if this doesn't loudly fail though — it would mean that <hb.h> is no longer being referenced.

I updated the first two however, thanks for the advice 👍

Comment on lines +75 to +100
export VERBOSE=1
cmake --build . --config Release
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
export VERBOSE=1
cmake --build . --config Release
cmake --build . --config Release

Please use cmakeFlags to pass --config Release if necessary

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if that's possible, this is what I get when I try to do that:
2024-07-20-011255_hyprshot

It's a flag that's explicitly documented in their README so I assumed it was necessary

@socksy socksy force-pushed the add-friction branch 2 times, most recently from 3035b87 to b301531 Compare July 19, 2024 23:26
@socksy socksy force-pushed the add-friction branch 2 times, most recently from 6e798e9 to b11b019 Compare August 12, 2024 16:31
@socksy socksy force-pushed the add-friction branch 2 times, most recently from d65d7c2 to 5ecd3f6 Compare September 28, 2024 09:19
@socksy
Copy link
Contributor Author

socksy commented Oct 11, 2024

Why is this never passing the formatting check? I am trying locally with the exact same commands and see no problems

@FliegendeWurst
Copy link
Member

Why is this never passing the formatting check? I am trying locally with the exact same commands and see no problems

You need to rebase locally first.

@socksy socksy force-pushed the add-friction branch 3 times, most recently from 77456db to 1809c70 Compare November 14, 2024 12:55
@socksy
Copy link
Contributor Author

socksy commented Nov 14, 2024

@FliegendeWurst thanks so much, it finally passes! I had thought that just using the rfc-style version would be enough, didn't realize that I could've had an outdated one locally

clangStdenv.mkDerivation rec {
pname = "friction.graphics";
version = "0.9.6.1";
src = fetchgit {
Copy link
Member

@FliegendeWurst FliegendeWurst Nov 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use fetchFromGitHub, with tag = "v${version}"

@FliegendeWurst FliegendeWurst added the 2.status: needs-changes This PR needs changes by the author label Mar 1, 2025
@FliegendeWurst FliegendeWurst marked this pull request as draft March 1, 2025 14:37
@nixpkgs-ci nixpkgs-ci bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 25, 2025
@nixpkgs-ci nixpkgs-ci bot added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 25, 2025
@nixpkgs-ci nixpkgs-ci bot removed the 12.first-time contribution This PR is the author's first one; please be gentle! label Jul 5, 2025
@hackerncoder
Copy link
Contributor

Hello, could you take a look at this again socksy and finish it? Thank you!

@nixpkgs-ci nixpkgs-ci bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 18, 2025
@luzpaz
Copy link
Contributor

luzpaz commented Aug 12, 2025

Hi @socksy any chance you can follow through with this ?

@socksy
Copy link
Contributor Author

socksy commented Aug 13, 2025

The last time I had look at it, 24.11 broke the build due to some clash with the forked skia and gn. I had also tried to incorporate some of the feedback here that seemed incompatible with the build process of this particular package. Obviously since then nixpkgs 25.05 and friction-graphics 1.0.0-RC2 have been released, so perhaps these issues have solved themselves. I'll give it another crack soon.

(Worth noting perhaps that I had a working version of v0.9.6 in a flake at https://github.com/socksy/friction-graphics-flake)

@socksy socksy changed the title friction-graphics: init at 0.9.6 friction-graphics: init at 1.0.0-rc.2 Aug 13, 2025
@nixpkgs-ci nixpkgs-ci bot removed the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Aug 13, 2025
@socksy socksy marked this pull request as ready for review August 16, 2025 17:02
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 2.status: needs-changes This PR needs changes by the author 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants