Unverified Commit 68fbe0a4 authored by ajs124's avatar ajs124 Committed by GitHub
Browse files

Merge pull request #199109 from NickCao/xca 

xca: build with openssl 3.0
parents 00a94dde 6c871c38

pkgs/applications/misc/xca/default.nix

+7 −1
Original line number Diff line number Diff line 
{ 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 ];

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 { };