nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 03:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241036 from NixOS/backport-240893-to-staging-23.05

Browse Source 
[Backport staging-23.05] libwebp: 1.3.0 -> 1.3.1
This commit is contained in:
ajs124
2023-07-02 19:32:49 +02:00
committed by GitHub
parent 8b1a1c6f90 bf9b9a7aac
commit 791ac4a897
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/libwebp/default.nix
View File

@@ -1,5 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool
, fetchpatch
, threadingSupport ? true # multi-threading
, openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp)
, pngSupport ? true, libpng # PNG image format
@@ -28,24 +27,15 @@
stdenv.mkDerivation rec {
pname = "libwebp";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "webmproject";
repo = pname;
rev = "v${version}";
hash = "sha256-nhXkq+qKpaa75YQB/W/cRozslTIFPdXeqj1y6emQeHk=";
hash = "sha256-Q94avvKjPdwdGt5ADo30cf2V4T7MCTubDHJxTtbG4xQ=";
};
patches = [
# https://www.mozilla.org/en-US/security/advisories/mfsa2023-13/#MFSA-TMP-2023-0001
(fetchpatch {
url = "https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129.patch";
name = "fix-msfa-tmp-2023-0001.patch";
hash = "sha256-TRKXpNkYVzftBw09mX+WeQRhRoOzBgXFTNZBzSdCKvc=";
})
];
configureFlags = [
(lib.enableFeature threadingSupport "threading")
(lib.enableFeature openglSupport "gl")