diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-07-30 13:34:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 13:34:22 -0500 |
| commit | 82c86c38e515c474be181ca0ed15c05229c73d4c (patch) | |
| tree | a01151383686aedfade65de4440f22e5e4c64f58 /pkgs | |
| parent | 3d1ca2fa610da75f5cb00e24d33879ca42c463e1 (diff) | |
| parent | 3593043f4b5764977d3edbcec32ea544f7e94ee7 (diff) | |
Merge pull request #183958 from marsam/update-gifski
gifski: 1.6.4 -> 1.7.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch | 12 | ||||
| -rw-r--r-- | pkgs/tools/graphics/gifski/default.nix | 14 |
2 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch b/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch new file mode 100644 index 0000000000000..bfccf45b6dcfa --- /dev/null +++ b/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch @@ -0,0 +1,12 @@ +diff --git c/Cargo.lock i/Cargo.lock +index 9b8929c..8e1e923 100644 +--- c/Cargo.lock ++++ i/Cargo.lock +@@ -303,6 +303,7 @@ dependencies = [ + "lodepng", + "loop9", + "natord", ++ "num-traits", + "pbr", + "quick-error", + "resize", diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index bf3cbf420b142..ffd60b5b77832 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,21 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-TD6MSZfvJ8fLJxvDh4fc4Dij5t4WSH2/i9Jz7eBmlME="; + sha256 = "sha256-cycgrQ1f0x1tPziQCRyqWinG8v0SVYW3LpFsxhZpQhE="; }; - cargoSha256 = "sha256-kG0svhytDzm2dc//8WTFm1sI3WS0Ny9yhYTSMoXnt8I="; + cargoPatches = [ ./cargo.lock-fix-missing-dependency.patch ]; - nativeBuildInputs = [ pkg-config ]; + cargoSha256 = "sha256-qJ+awu+Ga3fdxaDKdSzCcdyyuKCheb87qT7tX1dL1zo="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + # error: the crate `gifski` is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind` + doCheck = !stdenv.isDarwin; meta = with lib; { - broken = stdenv.isDarwin; description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; license = licenses.agpl3; |