swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
owncloud-client: improve nix expressions
This commit is contained in:
Weijia Wang 2023-05-05 14:28:07 +03:00 committed by GitHub
parent cb8d5f9653 0fc052a4f4
commit 3e313808bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/owncloud-client/default.nix
View file

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, mkDerivation , mkDerivation
, pkg-config , pkg-config
@ -7,12 +8,13 @@
, callPackage , callPackage
, qtbase , qtbase
, qtkeychain , qtkeychain
, wrapQtAppsHook
, qttools , qttools
, sqlite , sqlite
, libsecret , libsecret
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "owncloud-client"; pname = "owncloud-client";
version = "3.2.1"; version = "3.2.1";
@ -25,12 +27,8 @@ mkDerivation rec {
hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE="; hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";
}; };
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ];
buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ]; buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ];
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
];
cmakeFlags = [ cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR" "-UCMAKE_INSTALL_LIBDIR"

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

@ -1,11 +1,12 @@
{ lib { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, mkDerivation
, cmake , cmake
, qtbase , qtbase
, wrapQtAppsHook
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "libre-graph-api-cpp-qt-client"; pname = "libre-graph-api-cpp-qt-client";
version = "0.13.2"; version = "0.13.2";
@ -18,7 +19,7 @@ mkDerivation rec {
sourceRoot = "source/client"; sourceRoot = "source/client";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
cmakeFlags = [ ]; cmakeFlags = [ ];