|
|
@ -5,34 +5,31 @@ |
|
|
|
, darwin |
|
|
|
, darwin |
|
|
|
|
|
|
|
|
|
|
|
, asciidoctor |
|
|
|
, asciidoctor |
|
|
|
|
|
|
|
, botan2 |
|
|
|
, curl |
|
|
|
, curl |
|
|
|
, glibcLocales |
|
|
|
|
|
|
|
, libXi |
|
|
|
, libXi |
|
|
|
, libXtst |
|
|
|
, libXtst |
|
|
|
, libargon2 |
|
|
|
, libargon2 |
|
|
|
, libgcrypt |
|
|
|
, libusb1 |
|
|
|
, libgpg-error |
|
|
|
, minizip |
|
|
|
, libsodium |
|
|
|
, pcsclite |
|
|
|
, libyubikey |
|
|
|
|
|
|
|
, pkg-config |
|
|
|
, pkg-config |
|
|
|
, qrencode |
|
|
|
, qrencode |
|
|
|
, qtbase |
|
|
|
, qtbase |
|
|
|
, qtmacextras |
|
|
|
, qtmacextras |
|
|
|
, qtsvg |
|
|
|
, qtsvg |
|
|
|
, qtx11extras |
|
|
|
, qtx11extras |
|
|
|
, quazip |
|
|
|
|
|
|
|
, readline |
|
|
|
, readline |
|
|
|
, wrapGAppsHook |
|
|
|
, wrapGAppsHook |
|
|
|
, wrapQtAppsHook |
|
|
|
, wrapQtAppsHook |
|
|
|
, yubikey-personalization |
|
|
|
|
|
|
|
, zlib |
|
|
|
, zlib |
|
|
|
|
|
|
|
|
|
|
|
, withKeePassBrowser ? true |
|
|
|
, withKeePassBrowser ? true |
|
|
|
, withKeePassKeeShare ? true |
|
|
|
, withKeePassKeeShare ? true |
|
|
|
, withKeePassKeeShareSecure ? true |
|
|
|
|
|
|
|
, withKeePassSSHAgent ? true |
|
|
|
, withKeePassSSHAgent ? true |
|
|
|
, withKeePassNetworking ? true |
|
|
|
, withKeePassNetworking ? true |
|
|
|
, withKeePassTouchID ? true |
|
|
|
, withKeePassTouchID ? true |
|
|
|
|
|
|
|
, withKeePassYubiKey ? true |
|
|
|
, withKeePassFDOSecrets ? true |
|
|
|
, withKeePassFDOSecrets ? true |
|
|
|
|
|
|
|
|
|
|
|
, nixosTests |
|
|
|
, nixosTests |
|
|
@ -42,13 +39,13 @@ with lib; |
|
|
|
|
|
|
|
|
|
|
|
stdenv.mkDerivation rec { |
|
|
|
stdenv.mkDerivation rec { |
|
|
|
pname = "keepassxc"; |
|
|
|
pname = "keepassxc"; |
|
|
|
version = "2.6.6"; |
|
|
|
version = "2.7.1"; |
|
|
|
|
|
|
|
|
|
|
|
src = fetchFromGitHub { |
|
|
|
src = fetchFromGitHub { |
|
|
|
owner = "keepassxreboot"; |
|
|
|
owner = "keepassxreboot"; |
|
|
|
repo = "keepassxc"; |
|
|
|
repo = "keepassxc"; |
|
|
|
rev = version; |
|
|
|
rev = version; |
|
|
|
sha256 = "15rm3avdmc2x2n92zq6w1zbcranak4j6dds2sxmgdqi1ffc0a3ci"; |
|
|
|
sha256 = "sha256-BOtehDzlWhhfXj8TOFvFN4f86Hl2EC3rO4qUIl9fqq4="; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ |
|
|
|
NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ |
|
|
@ -66,15 +63,12 @@ stdenv.mkDerivation rec { |
|
|
|
cmakeFlags = [ |
|
|
|
cmakeFlags = [ |
|
|
|
"-DKEEPASSXC_BUILD_TYPE=Release" |
|
|
|
"-DKEEPASSXC_BUILD_TYPE=Release" |
|
|
|
"-DWITH_GUI_TESTS=ON" |
|
|
|
"-DWITH_GUI_TESTS=ON" |
|
|
|
"-DWITH_XC_AUTOTYPE=ON" |
|
|
|
|
|
|
|
"-DWITH_XC_UPDATECHECK=OFF" |
|
|
|
"-DWITH_XC_UPDATECHECK=OFF" |
|
|
|
"-DWITH_XC_YUBIKEY=ON" |
|
|
|
|
|
|
|
] |
|
|
|
] |
|
|
|
++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") |
|
|
|
++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") |
|
|
|
++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") |
|
|
|
++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") |
|
|
|
++ (optional withKeePassKeeShareSecure "-DWITH_XC_KEESHARE_SECURE=ON") |
|
|
|
|
|
|
|
++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") |
|
|
|
++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") |
|
|
|
++ (optional (withKeePassTouchID && stdenv.isDarwin) "-DWITH_XC_TOUCHID=ON") |
|
|
|
++ (optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") |
|
|
|
++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") |
|
|
|
++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") |
|
|
|
++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); |
|
|
|
++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); |
|
|
|
|
|
|
|
|
|
|
@ -95,26 +89,22 @@ stdenv.mkDerivation rec { |
|
|
|
|
|
|
|
|
|
|
|
buildInputs = [ |
|
|
|
buildInputs = [ |
|
|
|
curl |
|
|
|
curl |
|
|
|
glibcLocales |
|
|
|
botan2 |
|
|
|
libXi |
|
|
|
libXi |
|
|
|
libXtst |
|
|
|
libXtst |
|
|
|
libargon2 |
|
|
|
libargon2 |
|
|
|
libgcrypt |
|
|
|
minizip |
|
|
|
libgpg-error |
|
|
|
pcsclite |
|
|
|
libsodium |
|
|
|
|
|
|
|
libyubikey |
|
|
|
|
|
|
|
qrencode |
|
|
|
qrencode |
|
|
|
qtbase |
|
|
|
qtbase |
|
|
|
qtsvg |
|
|
|
qtsvg |
|
|
|
qtx11extras |
|
|
|
qtx11extras |
|
|
|
readline |
|
|
|
readline |
|
|
|
yubikey-personalization |
|
|
|
|
|
|
|
zlib |
|
|
|
zlib |
|
|
|
] |
|
|
|
] |
|
|
|
++ optional withKeePassKeeShareSecure quazip |
|
|
|
++ optional stdenv.isLinux libusb1 |
|
|
|
++ optional stdenv.isDarwin qtmacextras |
|
|
|
++ optional stdenv.isDarwin qtmacextras |
|
|
|
++ optional (stdenv.isDarwin && withKeePassTouchID) |
|
|
|
++ optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; |
|
|
|
darwin.apple_sdk.frameworks.LocalAuthentication; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
passthru.tests = nixosTests.keepassxc; |
|
|
|
passthru.tests = nixosTests.keepassxc; |
|
|
|
|
|
|
|
|
|
|
@ -131,5 +121,6 @@ stdenv.mkDerivation rec { |
|
|
|
license = licenses.gpl2Plus; |
|
|
|
license = licenses.gpl2Plus; |
|
|
|
maintainers = with maintainers; [ jonafato turion ]; |
|
|
|
maintainers = with maintainers; [ jonafato turion ]; |
|
|
|
platforms = platforms.linux ++ platforms.darwin; |
|
|
|
platforms = platforms.linux ++ platforms.darwin; |
|
|
|
|
|
|
|
broken = stdenv.isDarwin; # see to https://github.com/NixOS/nixpkgs/issues/172165 |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|