Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7637b37955f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e828dcb5cd4a
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 13, 2017

  1. nextcloud-client: use cmakeDir and cmakeFlags attrs

    @eqyiel
    eqyiel committed Sep 13, 2017
    Copy the full SHA
    ebb6488 View commit details

  2. nextcloud-client: add inotify dependency when building on linux 

    This allows for more efficient change detection.
    @eqyiel
    eqyiel committed Sep 13, 2017
    Copy the full SHA
    e02f936 View commit details

  3. nextcloud-client: enable parallel building 

    So that the client can build faster.
    @eqyiel
    eqyiel committed Sep 13, 2017
    Copy the full SHA
    4ce18c8 View commit details

  4. nextcloud-client: provide optional gnome-keyring integration 

    `qtkeyring` can use `gnome-keyring`, but it needs some help to find it.

I have not enabled this by default because not everyone who uses this will want
to pull in GNOME dependencies.
    @eqyiel
    eqyiel committed Sep 13, 2017
    Copy the full SHA
    e828dcb View commit details
Showing with 24 additions and 4 deletions.
  1. +24 −4 pkgs/applications/networking/nextcloud-client/default.nix
28 changes: 24 additions & 4 deletions pkgs/applications/networking/nextcloud-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite
, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }:

stdenv.mkDerivation rec {
name = "nextcloud-client-${version}";
@@ -12,10 +13,29 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];

preConfigure = ''
cmakeFlagsArray+=("-UCMAKE_INSTALL_LIBDIR" "-DOEM_THEME_DIR=$(realpath ./nextcloudtheme)" "../client")
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]
++ stdenv.lib.optional stdenv.isLinux inotify-tools
++ stdenv.lib.optional withGnomeKeyring makeWrapper;

enableParallelBuilding = true;

dontUseCmakeBuildDir = true;

cmakeDir = "client";

cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR"
"-DCMAKE_BUILD_TYPE=Release"
"-DOEM_THEME_DIR=${src}/nextcloudtheme"
] ++ stdenv.lib.optionals stdenv.isLinux [
"-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so"
"-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include"
];

postInstall = stdenv.lib.optionalString (withGnomeKeyring) ''
wrapProgram "$out/bin/nextcloud" \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}
'';

meta = with stdenv.lib; {