Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-23.11] sweethome3d.application: 7.2 -> 7.3 #304031

Merged

Conversation

bigshaq9999
Copy link
Contributor

Description of changes

From: #303120

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.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.

nbdd0121 and others added 5 commits April 15, 2024 19:27
Currently SweetHome3D cannot run on NixOS. It startups with

    Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null

error, and the cause is by inability to find libGL/libEGL.

Add libGL to path to fix this. This also allows to remove MESA override.

(cherry picked from commit a35ae3a)
The comment about 6.5 is no longer relevant.
I have tested building and running with latest JDK/JRE and it works well,
with more updated look & feel.

(cherry picked from commit ba45aa9)
Other small fixes:
 - Fix hashes to use hash instead of sha256
 - Change license from gpl2 to gpl2Plus for the last remaining unchanged license.
 - Remove unused d2u function.

(cherry picked from commit 2eb6898)
(cherry picked from commit 8b3445a)
@bigshaq9999 bigshaq9999 force-pushed the backport-303120-to-release-23.11 branch from f31f3ab to e120c81 Compare April 15, 2024 12:29
@ofborg ofborg bot requested a review from edwtjo April 15, 2024 12:50
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Apr 15, 2024
@tomberek
Copy link
Contributor

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

3 packages built:
  • sweethome3d.application
  • sweethome3d.furniture-editor
  • sweethome3d.textures-editor

@bjornfor bjornfor merged commit 1552982 into NixOS:release-23.11 May 5, 2024
24 checks passed
@bjornfor
Copy link
Contributor

bjornfor commented May 5, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants