Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 635b5fc95f90
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 458ff5a7a0a7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 25, 2018

  1. keepassxc: fix darwin build

    @knedlsepp
    knedlsepp committed Mar 25, 2018
    Copy the full SHA
    2a80448 View commit details

  2. keepassxc: 2.3.0 -> 2.3.1

    @knedlsepp
    knedlsepp committed Mar 25, 2018
    Copy the full SHA
    3f1a03b View commit details

Commits on Mar 26, 2018

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

    keepassxc: fix darwin build
    @Mic92
    Mic92 authored Mar 26, 2018
    Copy the full SHA
    458ff5a View commit details
Showing with 15 additions and 4 deletions.
  1. +15 −4 pkgs/applications/misc/keepassx/community.nix
19 changes: 15 additions & 4 deletions pkgs/applications/misc/keepassx/community.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
, yubikey-personalization
, libXi
, qtx11extras
, qtmacextras

, withKeePassBrowser ? true
, withKeePassSSHAgent ? true
@@ -25,17 +26,27 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "keepassxc-${version}";
version = "2.3.0";
version = "2.3.1";

src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
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 ];

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.