pyrox.dev / nixpkgs
lol
fork atom

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

+9 -10
unified split
+5 -7
pkgs/applications/networking/owncloud-client/default.nix
··· 1 { lib 2 , fetchFromGitHub 3 , mkDerivation 4 , pkg-config ··· 7 , callPackage 8 , qtbase 9 , qtkeychain 10 , qttools 11 , sqlite 12 , libsecret 13 }: 14 15 - mkDerivation rec { 16 pname = "owncloud-client"; 17 version = "3.2.1"; 18 ··· 25 hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE="; 26 }; 27 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 - ]; 34 35 cmakeFlags = [ 36 "-UCMAKE_INSTALL_LIBDIR"
··· 1 { lib 2 + , stdenv 3 , fetchFromGitHub 4 , mkDerivation 5 , pkg-config ··· 8 , callPackage 9 , qtbase 10 , qtkeychain 11 + , wrapQtAppsHook 12 , qttools 13 , sqlite 14 , libsecret 15 }: 16 17 + stdenv.mkDerivation rec { 18 pname = "owncloud-client"; 19 version = "3.2.1"; 20 ··· 27 hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE="; 28 }; 29 30 + nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ]; 31 + buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ]; 32 33 cmakeFlags = [ 34 "-UCMAKE_INSTALL_LIBDIR"
+4 -3
pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix
··· 1 { lib 2 , fetchFromGitHub 3 - , mkDerivation 4 , cmake 5 , qtbase 6 }: 7 8 - mkDerivation rec { 9 pname = "libre-graph-api-cpp-qt-client"; 10 version = "0.13.2"; 11 ··· 18 19 sourceRoot = "source/client"; 20 21 - nativeBuildInputs = [ cmake ]; 22 buildInputs = [ qtbase ]; 23 24 cmakeFlags = [ ];
··· 1 { lib 2 + , stdenv 3 , fetchFromGitHub 4 , cmake 5 , qtbase 6 + , wrapQtAppsHook 7 }: 8 9 + stdenv.mkDerivation rec { 10 pname = "libre-graph-api-cpp-qt-client"; 11 version = "0.13.2"; 12 ··· 19 20 sourceRoot = "source/client"; 21 22 + nativeBuildInputs = [ cmake wrapQtAppsHook ]; 23 buildInputs = [ qtbase ]; 24 25 cmakeFlags = [ ];