diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries/vte | |
parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/vte')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/vte/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix index e02d7973c6e9..7a998b409c2b 100644 --- a/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -20,6 +20,7 @@ , gperf , pango , pcre2 +, cairo , fribidi , zlib , icu @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.72.2"; + version = "0.74.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-95Zv0YWmmB9TlkFitxz+9+YGSVFV1vWCe3KqDdZ0HJ4="; + sha256 = "sha256-IyjD8cmYNQoY4OUTNI6fxYHVfqTnuJrt8R4OPGUEK08="; }; patches = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + cairo fribidi gnutls pcre2 @@ -82,11 +84,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" + (lib.mesonBool "gtk3" (gtkVersion == "3")) + (lib.mesonBool "gtk4" (gtkVersion == "4")) ] ++ lib.optionals (!systemdSupport) [ "-D_systemd=false" - ] ++ lib.optionals (gtkVersion == "4") [ - "-Dgtk3=false" - "-Dgtk4=true" ] ++ lib.optionals stdenv.isDarwin [ # -Bsymbolic-functions is not supported on darwin "-D_b_symbolic_functions=false" |