Skip to content

cloudcompare: creation of .desktop entry#293291

Merged
drupol merged 3 commits intoNixOS:masterfrom
locnide:fix/make-cloudcompare-compile
Mar 21, 2024
Merged

cloudcompare: creation of .desktop entry#293291
drupol merged 3 commits intoNixOS:masterfrom
locnide:fix/make-cloudcompare-compile

Conversation

@locnide
Copy link
Contributor

@locnide locnide commented Mar 4, 2024 •
edited
Loading

CloudCompare no longer provides snap directory with images and .desktop entry since they removed snap builds support. CloudCompare/CloudCompare@6e6e3f1
Those files where used during the nix package build to create a .desktop entry. Since they no longer exists the build fails : https://hydra.nixos.org/build/251747046/nixlog/1/tail

Description of changes

To solve the issue, the build of the desktop entry added in efdec26090fe6c61327b67d933e39d694da36bc2 has been removed.

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.

@ofborg ofborg bot requested a review from nh2 March 4, 2024 16:58
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages 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 Mar 4, 2024
drupol
drupol requested changes Mar 7, 2024
View reviewed changes
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

I agree with the PR, but to avoid breaking the desktop environment and confusing users relying on .desktop files, would it be possible to create the desktop entry within this PR ? It's quite trivial to do.

@locnide
Copy link
Contributor Author

locnide commented Mar 8, 2024 •
edited
Loading

I agree with the PR, but to avoid breaking the desktop environment and confusing users relying on .desktop files, would it be possible to create the desktop entry within this PR ? It's quite trivial to do.

You're right. I removed it because the .desktop entries were introduced in unstable but it's better to keep them.
I put them back.

drupol
drupol reviewed Mar 8, 2024
View reviewed changes
@drupol drupol changed the title Remove creation of .desktop entry in cloudcompare CloudCompare: creation of .desktop entry Mar 11, 2024
@drupol drupol changed the title CloudCompare: creation of .desktop entry cloudcompare: creation of .desktop entry Mar 11, 2024
drupol
drupol requested changes Mar 11, 2024
View reviewed changes
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

Looks like it's not building anymore.

@locnide
Copy link
Contributor Author

locnide commented Mar 11, 2024

Looks like it's not building anymore.

Seems that default jdk version has been changed 2 days ago and gdal dependency do not build anymore.
I will look at it later, either by using gdalMinimal if it is possible, or fixing gdal.

@drupol drupol marked this pull request as draft March 11, 2024 11:08
@drupol
Copy link
Contributor

drupol commented Mar 11, 2024

I've set the PR in draft in the meantime.

locnide added 2 commits March 21, 2024 13:29
@locnide
cloudcompare: add desktop entries for ccViewer and CloudCompare
947c66d 
CloudCompare no longer provides snap directory with images and .desktop
entry since they removed snap builds support.

Those files where used during the nix package build to create a .desktop
entry. Since they no longer exists the build fails.

To solve the issue, the build of the desktop entry have been replaced by
desktop entries in the package definition.
@locnide
cloudcompare: set mainProgram to CloudCompare
c17ac8a
@locnide locnide force-pushed the fix/make-cloudcompare-compile branch from e3cd9b0 to c17ac8a Compare March 21, 2024 12:31
@locnide locnide marked this pull request as ready for review March 21, 2024 12:32
@locnide
Copy link
Contributor Author

locnide commented Mar 21, 2024

The issue have been solved in gdal. Cloudcompare builds again.
I rebased on master.

I just saw that it was updated to v2.13.1. I updated the package. Sorry for the noise.

@drupol drupol merged commit b2b626a into NixOS:master Mar 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@drupol drupol drupol approved these changes

@nh2 nh2 Awaiting requested review from nh2

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@locnide @drupol