nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37790 from knedlsepp/fix-keepassxc-on-darwin

Browse Source 
keepassxc: fix darwin build
This commit is contained in:
Jörg Thalheim 2018-03-26 10:04:47 +01:00 committed by GitHub
commit 458ff5a7a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/misc/keepassx/community.nix
View File

@ -14,6 +14,7 @@
, yubikey-personalization , yubikey-personalization
, libXi , libXi
, qtx11extras , qtx11extras
, qtmacextras
, withKeePassBrowser ? true , withKeePassBrowser ? true
, withKeePassSSHAgent ? true , withKeePassSSHAgent ? true
@ -25,17 +26,27 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "keepassxc-${version}"; name = "keepassxc-${version}";
version = "2.3.0"; version = "2.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keepassxreboot"; owner = "keepassxreboot";
repo = "keepassxc"; repo = "keepassxc";
rev = "${version}"; rev = "${version}";
sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f"; sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87";
}; };
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-old-style-cast"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
"-Wno-old-style-cast"
"-Wno-error"
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace "/usr/local/bin" "../bin" \
--replace "/usr/local/share/man" "../share/man"
'';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
patches = [ ./darwin.patch ]; patches = [ ./darwin.patch ];
cmakeFlags = [ cmakeFlags = [
@ -72,7 +83,7 @@ stdenv.mkDerivation rec {
qtx11extras qtx11extras
yubikey-personalization yubikey-personalization
zlib zlib
]; ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
postInstall = optionalString stdenv.isDarwin '' postInstall = optionalString stdenv.isDarwin ''
# Make it work without Qt in PATH. # Make it work without Qt in PATH.