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

Jump to bottom

nextcloud-client: clean up #67367

Merged
merged 2 commits into from Aug 24, 2019
Merged

nextcloud-client: clean up #67367

merged 2 commits into from Aug 24, 2019

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Aug 23, 2019 •
edited

Continuation of #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 https://github.com/NixOS/nixpkgs/pull/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.
  • Formatted the expression.

cc @Ma27 @worldofpeace

@ofborg ofborg bot requested a review from Ma27 August 23, 2019 20:41
@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.
@jtojnar
nextcloud-client: format expression
80fbcf2
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.

Executes on my machine. I'm not a nextcloud user so we should await feedback from @Ma27.

mmahut
mmahut approved these changes Aug 23, 2019
View reviewed changes
Copy link
Member

@mmahut mmahut left a comment

Choose a reason for hiding this comment

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

Thank you for this clean up!

The client looks good, I was able to connect to the nextcloud and sync up files.

@disassembler disassembler merged commit 5f202e0 into NixOS:master Aug 24, 2019
@jtojnar jtojnar deleted the nextcloud-cleanup branch August 24, 2019 07:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmahut mmahut mmahut approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

@Ma27 Ma27 Awaiting requested review from Ma27

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
4 participants
@jtojnar @mmahut @worldofpeace @disassembler