mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 02:15:21 +09:00
Merge pull request #315739 from NixOS/backport-315592-to-release-24.05
[Backport release-24.05] libfpx: remove register storage specifier
This commit is contained in:
commit
d1888a87e8
1 changed files with 7 additions and 0 deletions
|
@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch";
|
url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch";
|
||||||
sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9";
|
sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9";
|
||||||
})
|
})
|
||||||
|
# fix clang build: remove register keyword
|
||||||
|
# remove on next update
|
||||||
|
(fetchpatch {
|
||||||
|
name = "remove-register-keyword.patch";
|
||||||
|
url = "https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041.patch";
|
||||||
|
hash = "sha256-6m9MFb1eWGK5cMvPmTu7uh3Pac65r2HPB8wJ8xc1O5o=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue