diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2021-09-18 18:47:35 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-09-20 07:57:19 +0000 |
| commit | 53063b4e3cc31ccf9e512c07196965f7241921d8 (patch) | |
| tree | 4980cc81303728c22210ec56bf40ddfad23d9e9d | |
| parent | Merge pull request #138118 from NixOS/backport-137533-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-138445-to-release-21.05.tar.gz | |
libsixel: 1.8.6 -> 1.10.1origin/backport-138445-to-release-21.05
- Switched to maintained fork of libsixel
- Linked CVEs were fixed in 1.10.1
(cherry picked from commit 86682241081f7e291b8df454f60c0200b7f26050)
| -rw-r--r-- | pkgs/development/libraries/libsixel/default.nix | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 0d5a54f9693e..549f4385fa56 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,30 +1,56 @@ -{lib, stdenv, fetchFromGitHub}: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, libbsd +, gdk-pixbuf +, gd +, libjpeg +, pkg-config +, fetchpatch +}: stdenv.mkDerivation rec { - version = "1.8.6"; pname = "libsixel"; + version = "1.10.1"; src = fetchFromGitHub { + owner = "libsixel"; repo = "libsixel"; rev = "v${version}"; - owner = "saitoha"; - sha256 = "1saxdj6sldv01g6w6yk8vr7px4bl31xca3a82j6v1j3fw5rbfphy"; + sha256 = "sha256-ACypJTFjXSzBjo4hQzUiJOqnaRaZnYX+/NublN9sbBo="; }; - configureFlags = [ - "--enable-tests" + patches = [ + (fetchpatch { + url = "https://github.com/libsixel/libsixel/commit/4d3e53ee007f3b71f638875f9fabbba658b2ca8a.patch"; + sha256 = "sha256-iDfsTyUczjtzV3pt1ZErbhVO2rMm2ZYKWSBl+ru+5HA="; + }) + ]; + + buildInputs = [ + libbsd gdk-pixbuf gd + ]; + + nativeBuildInputs = [ + meson ninja pkg-config ]; doCheck = true; + mesonFlags = [ + "-Dtests=enabled" + # build system seems to be broken here, it still seems to handle jpeg + # through some other ways. + "-Djpeg=disabled" + "-Dpng=disabled" + ]; + meta = with lib; { description = "The SIXEL library for console graphics, and converter programs"; - homepage = "http://saitoha.github.com/libsixel"; + homepage = "https://github.com/libsixel/libsixel"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; - platforms = with platforms; unix; - knownVulnerabilities = [ - "CVE-2020-11721" # https://github.com/saitoha/libsixel/issues/134 - "CVE-2020-19668" # https://github.com/saitoha/libsixel/issues/136 - ]; + platforms = platforms.unix; }; } |