diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/libraries/libdazzle | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libdazzle')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libdazzle/default.nix | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index 426ffadf4c6e..7f4c53071d0c 100644 --- a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -1,20 +1,53 @@ -{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }: +{ lib +, stdenv +, fetchurl +, ninja +, meson +, pkg-config +, vala +, gobject-introspection +, libxml2 +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, dbus +, xvfb-run +, glib +, gtk3 +, gnome +}: stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.42.0"; + version = "3.44.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09b9l56yiwad7xqr7g7ragmm4gmqxjnvc2pcx6741klw7lxpmrpa"; + sha256 = "PNPkXrbiaAywXVLh6A3Y+dWdR2UhLw4o945sF4PRjq4="; }; - nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ]; - buildInputs = [ glib gtk3 ]; + nativeBuildInputs = [ + ninja + meson + pkg-config + vala + gobject-introspection + libxml2 + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + dbus + xvfb-run + glib + ]; + + buildInputs = [ + glib + gtk3 + ]; mesonFlags = [ "-Denable_gtk_doc=true" |