pyrox.dev
Merge pull request #230081 from hellwolf/owncloud-client-improve-nix
owncloud-client: improve nix expressions
authored by Weijia Wang and committed by GitHub 3e313808 cb8d5f96
+5
-7
pkgs/applications/networking/owncloud-client/default.nix
+5
-7
pkgs/applications/networking/owncloud-client/default.nix
···
1
1
{ lib
2
+
, stdenv
2
3
, fetchFromGitHub
3
4
, mkDerivation
4
5
, pkg-config
···
7
8
, callPackage
8
9
, qtbase
9
10
, qtkeychain
11
+
, wrapQtAppsHook
10
12
, qttools
11
13
, sqlite
12
14
, libsecret
13
15
}:
14
16
15
-
mkDerivation rec {
17
+
stdenv.mkDerivation rec {
16
18
pname = "owncloud-client";
17
19
version = "3.2.1";
18
20
···
25
27
hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";
26
28
};
27
29
28
-
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
29
-
buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ];
30
-
31
-
qtWrapperArgs = [
32
-
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
33
-
];
30
+
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ];
31
+
buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ];
34
32
35
33
cmakeFlags = [
36
34
"-UCMAKE_INSTALL_LIBDIR"
+4
-3
pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix
+4
-3
pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix
···
1
1
{ lib
2
+
, stdenv
2
3
, fetchFromGitHub
3
-
, mkDerivation
4
4
, cmake
5
5
, qtbase
6
+
, wrapQtAppsHook
6
7
}:
7
8
8
-
mkDerivation rec {
9
+
stdenv.mkDerivation rec {
9
10
pname = "libre-graph-api-cpp-qt-client";
10
11
version = "0.13.2";
11
12
···
18
19
19
20
sourceRoot = "source/client";
20
21
21
-
nativeBuildInputs = [ cmake ];
22
+
nativeBuildInputs = [ cmake wrapQtAppsHook ];
22
23
buildInputs = [ qtbase ];
23
24
24
25
cmakeFlags = [ ];