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

Merge pull request #199109 from NickCao/xca

Browse Source 
xca: build with openssl 3.0
This commit is contained in:
ajs124 2022-11-02 13:42:26 +01:00 committed by GitHub
commit 68fbe0a4cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config
, libtool, openssl, qtbase, qttools, sphinx }:
mkDerivation rec {
@ -12,6 +12,12 @@ mkDerivation rec {
sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk";
};
# Adaptions to stay OpenSSL 3.0 compatible
patches = [ (fetchpatch {
url = "https://github.com/chris2511/xca/commit/f5ac099e948ea354deac75ff9fa09d51453476e1.patch";
hash = "sha256-4rRO2y9hZq879HTsgBgbXGRYEcgfG4niJKyK3l3PMZ8=";
}) ];
buildInputs = [ libtool openssl qtbase ];
nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ];

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

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