From ebb6488e74f17dce5c54348e98797bdda2912650 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Tue, 12 Sep 2017 09:01:41 +0930 Subject: nextcloud-client: use cmakeDir and cmakeFlags attrs --- pkgs/applications/networking/nextcloud-client/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d369ec63a948..a3dce871c4bb 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -14,9 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; - preConfigure = '' - cmakeFlagsArray+=("-UCMAKE_INSTALL_LIBDIR" "-DOEM_THEME_DIR=$(realpath ./nextcloudtheme)" "../client") - ''; + dontUseCmakeBuildDir = true; + + cmakeDir = "client"; + + cmakeFlags = [ + "-UCMAKE_INSTALL_LIBDIR" + "-DCMAKE_BUILD_TYPE=Release" + "-DOEM_THEME_DIR=${src}/nextcloudtheme" + ]; meta = with stdenv.lib; { description = "Nextcloud themed desktop client"; -- cgit 1.4.1