BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qtkeychain: 0.7.0 -> 0.8.0, fix darwin build

Browse source 
The darwin build was failing for two reasons
  1) cmake incorrectly detected the compiler
  2) missing Frameworks

/cc ZHF #36454
This commit is contained in:
Badi Abdul-Wahid 2018-03-11 19:44:55 -04:00
parent 8ba914a224
commit f047d5d754
No known key found for this signature in database
GPG key ID: 5C02A763FA1FF588
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/libraries/qtkeychain/default.nix
View file

@ -1,13 +1,15 @@
{ 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";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frankosterfeld"; owner = "frankosterfeld";
@ -16,16 +18,26 @@ stdenv.mkDerivation rec {
sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52"; sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52";
}; };
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;
}; };
} }