diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-11-02 13:31:10 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2022-11-02 20:22:50 +0800 |
| commit | 6c871c38be714c1cb4d5b7db6dd3a953cc6099e3 (patch) | |
| tree | 634f207d4ed2ed2f394333160a0c9497979f92ea | |
| parent | 608eb68fd8ab9e50186ffc3d7c7e842618037c2b (diff) | |
| download | nixpkgs-6c871c38be714c1cb4d5b7db6dd3a953cc6099e3.tar nixpkgs-6c871c38be714c1cb4d5b7db6dd3a953cc6099e3.tar.gz nixpkgs-6c871c38be714c1cb4d5b7db6dd3a953cc6099e3.tar.bz2 nixpkgs-6c871c38be714c1cb4d5b7db6dd3a953cc6099e3.tar.lz nixpkgs-6c871c38be714c1cb4d5b7db6dd3a953cc6099e3.tar.xz nixpkgs-6c871c38be714c1cb4d5b7db6dd3a953cc6099e3.tar.zst nixpkgs-6c871c38be714c1cb4d5b7db6dd3a953cc6099e3.zip | |
xca: build with openssl 3.0
| -rw-r--r-- | pkgs/applications/misc/xca/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 7b94af3b52a..f5c8e90d270 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7784e256c1a..d77ac700996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32949,7 +32949,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 { }; |