public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36834 from badi/qtkeychain

Browse Source 
qtkeychain: 0.7.0 -> 0.8.0, fix darwin build
This commit is contained in:
Matthew Justin Bauer 2018-03-23 14:40:03 -05:00 committed by GitHub
commit a9a715593c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/qtkeychain/default.nix
View File

@ -1,31 +1,43 @@
{ stdenv, fetchFromGitHub, cmake, qt4 ? null { stdenv, fetchFromGitHub, cmake, qt4 ? null
, withQt5 ? false, qtbase ? null, qttools ? null , withQt5 ? false, qtbase ? null, qttools ? null
, darwin ? null
}: }:
assert withQt5 -> qtbase != null; assert withQt5 -> qtbase != null;
assert withQt5 -> qttools != null; assert withQt5 -> qttools != null;
assert stdenv.isDarwin -> darwin != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}";
version = "0.7.0"; version = "0.8.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frankosterfeld"; owner = "frankosterfeld";
repo = "qtkeychain"; repo = "qtkeychain";
rev = "v${version}"; rev = "v${version}";
sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52"; sha256 = "1r6qp9l2lp5jpc6ciklbg1swvvzcpc37rg9py46hk0wxy6klnm0b"; # v0.8.0
}; };
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
++ stdenv.lib.optional stdenv.isDarwin [
# correctly detect the compiler
# for details see cmake --help-policy CMP0025
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
]
;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]; buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]
++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation Security
])
;
meta = { meta = {
description = "Platform-independent Qt API for storing passwords securely"; description = "Platform-independent Qt API for storing passwords securely";
homepage = https://github.com/frankosterfeld/qtkeychain; homepage = https://github.com/frankosterfeld/qtkeychain;
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }