Unverified Commit 3e313808 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #230081 from hellwolf/owncloud-client-improve-nix 

owncloud-client: improve nix expressions
parents cb8d5f96 0fc052a4

pkgs/applications/networking/owncloud-client/default.nix

+5 −7
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, mkDerivation

, pkg-config
@@ -7,12 +8,13 @@ 
, callPackage

, qtbase

, qtkeychain

, wrapQtAppsHook

, qttools

, sqlite

, libsecret

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "owncloud-client";

  version = "3.2.1";
@@ -25,12 +27,8 @@ mkDerivation rec { 
    hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";

  };



  nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];

  buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ];



  qtWrapperArgs = [

    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"

  ];

  nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ];

  buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ];



  cmakeFlags = [

    "-UCMAKE_INSTALL_LIBDIR"

pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix

+4 −3
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, mkDerivation

, cmake

, qtbase

, wrapQtAppsHook

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "libre-graph-api-cpp-qt-client";

  version = "0.13.2";
@@ -18,7 +19,7 @@ mkDerivation rec { 


  sourceRoot = "source/client";



  nativeBuildInputs = [ cmake ];

  nativeBuildInputs = [ cmake wrapQtAppsHook ];

  buildInputs = [ qtbase ];



  cmakeFlags = [  ];