uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
22
pkgs/applications/misc/keepassx/2.0.nix
Normal file
22
pkgs/applications/misc/keepassx/2.0.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepassx2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz";
|
||||
sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libgcrypt qt4 xorg.libXtst ];
|
||||
|
||||
meta = {
|
||||
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
|
||||
homepage = "https://www.keepassx.org/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ qknight ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
131
pkgs/applications/misc/keepassx/community.nix
Normal file
131
pkgs/applications/misc/keepassx/community.nix
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qttools
|
||||
, darwin
|
||||
|
||||
, asciidoctor
|
||||
, botan2
|
||||
, curl
|
||||
, libXi
|
||||
, libXtst
|
||||
, libargon2
|
||||
, libusb1
|
||||
, minizip
|
||||
, pcsclite
|
||||
, pkg-config
|
||||
, qrencode
|
||||
, qtbase
|
||||
, qtmacextras
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, readline
|
||||
, wrapGAppsHook
|
||||
, wrapQtAppsHook
|
||||
, zlib
|
||||
|
||||
, withKeePassBrowser ? true
|
||||
, withKeePassKeeShare ? true
|
||||
, withKeePassSSHAgent ? true
|
||||
, withKeePassNetworking ? true
|
||||
, withKeePassTouchID ? true
|
||||
, withKeePassYubiKey ? true
|
||||
, withKeePassFDOSecrets ? true
|
||||
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepassxc";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keepassxreboot";
|
||||
repo = "keepassxc";
|
||||
rev = version;
|
||||
sha256 = "sha256-BOtehDzlWhhfXj8TOFvFN4f86Hl2EC3rO4qUIl9fqq4=";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [
|
||||
"-Wno-old-style-cast"
|
||||
"-Wno-error"
|
||||
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
|
||||
|
||||
patches = [
|
||||
./darwin.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DKEEPASSXC_BUILD_TYPE=Release"
|
||||
"-DWITH_GUI_TESTS=ON"
|
||||
"-DWITH_XC_UPDATECHECK=OFF"
|
||||
]
|
||||
++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON")
|
||||
++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON")
|
||||
++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON")
|
||||
++ (optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON")
|
||||
++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON")
|
||||
++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON");
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
|
||||
# testcli and testgui are flaky - skip them both
|
||||
make test ARGS+="-E 'testcli|testgui' --output-on-failure"
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
postFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
botan2
|
||||
libXi
|
||||
libXtst
|
||||
libargon2
|
||||
minizip
|
||||
pcsclite
|
||||
qrencode
|
||||
qtbase
|
||||
qtsvg
|
||||
qtx11extras
|
||||
readline
|
||||
zlib
|
||||
]
|
||||
++ optional stdenv.isLinux libusb1
|
||||
++ optional stdenv.isDarwin qtmacextras
|
||||
++ optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
|
||||
|
||||
passthru.tests = nixosTests.keepassxc;
|
||||
|
||||
meta = {
|
||||
description = "Offline password manager with many features.";
|
||||
longDescription = ''
|
||||
A community fork of KeePassX, which is itself a port of KeePass Password Safe.
|
||||
The goal is to extend and improve KeePassX with new features and bugfixes,
|
||||
to provide a feature-rich, fully cross-platform and modern open-source password manager.
|
||||
Accessible via native cross-platform GUI, CLI, has browser integration
|
||||
using the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)
|
||||
'';
|
||||
homepage = "https://keepassxc.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ jonafato turion ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
broken = stdenv.isDarwin; # see to https://github.com/NixOS/nixpkgs/issues/172165
|
||||
};
|
||||
}
|
||||
37
pkgs/applications/misc/keepassx/darwin.patch
Normal file
37
pkgs/applications/misc/keepassx/darwin.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 74b1a7ff..0a713a32 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -307,6 +307,7 @@ if(MINGW)
|
||||
set(PLUGIN_INSTALL_DIR ".")
|
||||
set(DATA_INSTALL_DIR "share")
|
||||
elseif(APPLE AND WITH_APP_BUNDLE)
|
||||
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
|
||||
set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
|
||||
set(CMAKE_INSTALL_MANDIR "${BUNDLE_INSTALL_DIR}/Resources/man")
|
||||
set(CLI_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
|
||||
@@ -470,11 +470,6 @@ set(CMAKE_AUTORCC ON)
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_MACOSX_RPATH TRUE)
|
||||
- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
|
||||
- if(NOT MACDEPLOYQT_EXE)
|
||||
- message(FATAL_ERROR "macdeployqt is required to build on macOS")
|
||||
- endif()
|
||||
- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
|
||||
set(MACDEPLOYQT_EXTRA_BINARIES "")
|
||||
elseif(WIN32)
|
||||
find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
|
||||
diff --git a/src/post_install/CMakeLists.txt b/src/post_install/CMakeLists.txt
|
||||
index 359c891f..a6a061a3 100644
|
||||
--- a/src/post_install/CMakeLists.txt
|
||||
+++ b/src/post_install/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
# The install commands in this subdirectory will be executed after all the install commands in the
|
||||
# current scope are ran. It is required for correct functtioning of macdeployqt.
|
||||
|
||||
-if(APPLE AND WITH_APP_BUNDLE)
|
||||
+if(FALSE)
|
||||
# Run macdeloyqt on the main app and any extra binaries and plugins as specified by the
|
||||
# _MACDEPLOYQT_EXTRA_BINARIES global property.
|
||||
# All install(TARGETS) calls should have already been called.
|
||||
25
pkgs/applications/misc/keepassx/default.nix
Normal file
25
pkgs/applications/misc/keepassx/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepassx";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry";
|
||||
};
|
||||
|
||||
patches = [ ./random.patch ];
|
||||
|
||||
buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ];
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
|
||||
meta = {
|
||||
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
|
||||
homepage = "https://www.keepassx.org/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ qknight ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
13
pkgs/applications/misc/keepassx/random.patch
Normal file
13
pkgs/applications/misc/keepassx/random.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
--- a/src/lib/random.cpp 2014-01-21 21:15:55.829312723 +0000
|
||||
+++ b/src/lib/random.cpp 2014-01-21 21:16:36.752535839 +0000
|
||||
@@ -28,6 +28,10 @@
|
||||
#include <wincrypt.h>
|
||||
#include <QSysInfo>
|
||||
#endif
|
||||
+#ifndef Q_WS_WIN
|
||||
+ #include <sys/types.h>
|
||||
+ #include <unistd.h>
|
||||
+#endif
|
||||
|
||||
#include <QCryptographicHash>
|
||||
#include <QCursor>
|
||||
Loading…
Add table
Add a link
Reference in a new issue