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.

Sign up for GitHub

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

Jump to bottom

nextcloud-client: 2.5.2 -> 2.5.3 #67306

Merged
merged 1 commit into from Aug 23, 2019
Merged

nextcloud-client: 2.5.2 -> 2.5.3 #67306

merged 1 commit into from Aug 23, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Aug 22, 2019 •
edited

Motivation for this change

https://github.com/nextcloud/desktop/releases/tag/v2.5.3

Also move explicitly dbus configuration files to the store path rather than
/etc/dbus-1/services.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@worldofpeace
Copy link
Contributor

@Ma27 Can the patch be upstreamed?

@jtojnar
Copy link
Contributor

jtojnar commented Aug 22, 2019

It ought to be fixed with --define-variable datadir ${CMAKE_INSTALL_DATADIR}, see https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/. Not sure what the equivalent thing is for CMake.

@worldofpeace
Copy link
Contributor

That I'm aware of @jtojnar I don't think cmake has a way to do this.

Guess we'll have to override the pkgconfig variable.

@Ma27
Copy link
Member Author

Ma27 commented Aug 23, 2019

Unfortunately I didn't find a proper way to override the value with a cmake flag. I thought that the simplest approach would be to explicitly set a different install destination in the cmake flag as you'd have to override the pkgconfig vars from qtbase.

Is that fine for you or would you suggest something else? : )

@jtojnar
Copy link
Contributor

jtojnar commented Aug 23, 2019

In the absence of ability to use --define-variable, the current patch will have to suffice.

I doubt it is upstreamable though. Opened an issue against CMake: https://gitlab.kitware.com/cmake/cmake/issues/19632

@Ma27
Copy link
Member Author

Ma27 commented Aug 23, 2019

I doubt it is upstreamable though.

I'm aware of that. I figured that it's the best solution for now to add a simple patch which explicitly copies dbus configs to a store dir as Nix(OS) doesn't allow to imperatively alter global directories :)

Will fix the review comment of @worldofpeace, then this should be good to go.

@Ma27
nextcloud-client: 2.5.2 -> 2.5.3
8d62a39 
https://github.com/nextcloud/desktop/releases/tag/v2.5.3

Also move explicitly dbus configuration files to the store path rather than
`/etc/dbus-1/services`.
@Ma27
Copy link
Member Author

Ma27 commented Aug 23, 2019

@GrahamcOfBorg build nextcloud-client

worldofpeace
worldofpeace approved these changes Aug 23, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Works for me, verified it's wrapped.

@worldofpeace worldofpeace merged commit 54f3852 into NixOS:master Aug 23, 2019
@Ma27 Ma27 deleted the bump-nextcloud-client branch August 23, 2019 15:13
@jtojnar jtojnar mentioned this pull request Aug 23, 2019
Merged
jtojnar added a commit to jtojnar/nixpkgs that referenced this pull request Aug 23, 2019
@jtojnar
nextcloud-client: clean up
fc79a83 
Continuation of NixOS#67306

* Switched to non-deprecated dbus config path.
* Removed CMake flags for finding dependencies, the project can find them on its own.
* Properly fixed the RPATH issue from NixOS#15406 – ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}.
* Dropped changing Icon name in the desktop file as it was fixed upstream.
* Switched to fetchFromGitHub, as the submodules are only for Win, Mac & crash reporting.
* Dropped enableParallelBuilding = true, as it is on by default with CMake.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ma27 @worldofpeace @jtojnar