public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #138557 from NixOS/backport-138417-to-staging-21.05

Browse Source
This commit is contained in:
Doron Behar 2021-09-20 04:57:28 +00:00 committed by GitHub
commit 14bc56e94a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/gd/default.nix
View File

@ -14,27 +14,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gd"; pname = "gd";
version = "2.3.0"; version = "2.3.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz";
sha256 = "0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc"; sha256 = "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
patches = [
# Fixes an issue where some other packages would fail to build
# their documentation with an error like:
# "Error: Problem doing text layout"
#
# Can be removed if Wayland can still be built successfully with
# documentation.
(fetchpatch {
url = "https://github.com/libgd/libgd/commit/3dd0e308cbd2c24fde2fc9e9b707181252a2de95.patch";
excludes = [ "tests/gdimagestringft/.gitignore" ];
sha256 = "12iqlanl9czig9d7c3rvizrigw2iacimnmimfcny392dv9iazhl1";
})
];
# -pthread gets passed to clang, causing warnings # -pthread gets passed to clang, causing warnings
configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no"; configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no";