alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

keepassxc: fix darwin build

Browse source
This commit is contained in:
Josef Kemetmüller 2018-03-25 18:46:28 +02:00
parent a6425fc66d
commit 2a80448fed
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
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
@ -34,8 +35,18 @@ stdenv.mkDerivation rec {
sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f"; sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f";
}; };
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.