JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xca: 2.4.0 -> 2.6.0

Browse Source
This commit is contained in:
Peter Hoeg 2024-03-20 09:57:40 +01:00
parent bbc8ea1932
commit f8e9996d46
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/applications/misc/xca/default.nix
View File

@ -1,26 +1,35 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config { stdenv
, libtool, openssl, qtbase, qttools, sphinx }: , lib
, fetchFromGitHub
, wrapQtAppsHook
, cmake
, pkg-config
, openssl
, qtbase
, qttools
, sphinx
}:
mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "xca"; pname = "xca";
version = "2.4.0"; version = "2.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chris2511"; owner = "chris2511";
repo = "xca"; repo = "xca";
rev = "RELEASE.${version}"; rev = "RELEASE.${finalAttrs.version}";
sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk"; hash = "sha256-E0Ap+JDK/oYTG+uaRHsdOxyLIywlYJ01T4ANQhNH220=";
}; };
# Adaptions to stay OpenSSL 3.0 compatible buildInputs = [ openssl qtbase ];
patches = [ (fetchpatch {
url = "https://github.com/chris2511/xca/commit/f5ac099e948ea354deac75ff9fa09d51453476e1.patch";
hash = "sha256-4rRO2y9hZq879HTsgBgbXGRYEcgfG4niJKyK3l3PMZ8=";
}) ];
buildInputs = [ libtool openssl qtbase ]; nativeBuildInputs = [
cmake
nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ]; pkg-config
qttools
sphinx
wrapQtAppsHook
];
# Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710) # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710)
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
@ -28,12 +37,11 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin;
description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs";
mainProgram = "xca"; mainProgram = "xca";
homepage = "https://hohnstaedt.de/xca/"; homepage = "https://hohnstaedt.de/xca/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ offline peterhoeg ]; maintainers = with maintainers; [ offline peterhoeg ];
platforms = platforms.all; inherit (qtbase.meta) platforms;
}; };
} })

2
pkgs/top-level/all-packages.nix
View File

@ -35954,7 +35954,7 @@ with pkgs;
kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-cli = callPackage ../tools/misc/kodi-cli { };
xca = libsForQt5.callPackage ../applications/misc/xca { }; xca = qt6Packages.callPackage ../applications/misc/xca { };
xcalib = callPackage ../tools/X11/xcalib { }; xcalib = callPackage ../tools/X11/xcalib { };