mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
owncloud-client: improve nix expressions
This commit is contained in:
parent
7091454bd1
commit
0fc052a4f4
@ -1,4 +1,5 @@
|
||||
{ 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"
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ 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 = [ ];
|
||||
|
Loading…
Reference in New Issue
Block a user