diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-31 22:19:45 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-31 22:19:45 +0100 |
commit | 78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc (patch) | |
tree | fd9cfb92edfaa37c919be8d24063b8a6c6d94c83 /nixpkgs/pkgs/development/libraries/text-engine | |
parent | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (diff) | |
parent | 0cbe9f69c234a7700596e943bfae7ef27a31b735 (diff) | |
download | nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.gz nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.bz2 nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.lz nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.xz nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.zst nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.zip |
Merge commit '0cbe9f69c234a7700596e943bfae7ef27a31b735' into HEAD
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/text-engine')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/text-engine/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/text-engine/default.nix b/nixpkgs/pkgs/development/libraries/text-engine/default.nix index f578ae000baf..0a9004d01a58 100644 --- a/nixpkgs/pkgs/development/libraries/text-engine/default.nix +++ b/nixpkgs/pkgs/development/libraries/text-engine/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , json-glib @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes="; }; + patches = [ + # Fixes build with newer versions of clang + (fetchpatch { + url = "https://github.com/mjakeman/text-engine/commit/749c94d853c0b0e29e79a1b270ec61947b65c319.patch"; + hash = "sha256-vs/a8IBovArw8tc1ZLUsaDHRVyA71KMB1NGENOKNOdk="; + }) + ]; + nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ]; buildInputs = [ libadwaita json-glib libxml2 ]; |