diff options
| author | Josef Kemetmüller <josef.kemetmueller@gmail.com> | 2018-03-25 18:46:28 +0200 |
|---|---|---|
| committer | Josef Kemetmüller <josef.kemetmueller@gmail.com> | 2018-03-25 21:50:25 +0200 |
| commit | 2a80448fed239d4cf15aad88a6387a611db9e5f1 (patch) | |
| tree | c257685cf0f0eb0710326ede02a4a65d1860cc71 /pkgs/applications/misc/keepassx | |
| parent | a6425fc66dbbcdd8dc23c8c721e15d6ed6126325 (diff) | |
| download | nixlib-2a80448fed239d4cf15aad88a6387a611db9e5f1.tar nixlib-2a80448fed239d4cf15aad88a6387a611db9e5f1.tar.gz nixlib-2a80448fed239d4cf15aad88a6387a611db9e5f1.tar.bz2 nixlib-2a80448fed239d4cf15aad88a6387a611db9e5f1.tar.lz nixlib-2a80448fed239d4cf15aad88a6387a611db9e5f1.tar.xz nixlib-2a80448fed239d4cf15aad88a6387a611db9e5f1.tar.zst nixlib-2a80448fed239d4cf15aad88a6387a611db9e5f1.zip | |
keepassxc: fix darwin build
Diffstat (limited to 'pkgs/applications/misc/keepassx')
| -rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 4daa1938aba4..620039b5a94b 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -14,6 +14,7 @@ , yubikey-personalization , libXi , qtx11extras +, qtmacextras , withKeePassBrowser ? true , withKeePassSSHAgent ? true @@ -34,8 +35,18 @@ stdenv.mkDerivation rec { 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 ]; cmakeFlags = [ @@ -72,7 +83,7 @@ stdenv.mkDerivation rec { qtx11extras yubikey-personalization zlib - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; postInstall = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. |