diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/libraries/libvirt-glib | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvirt-glib')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index bb855ac767ee..b01a9a788bad 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -20,23 +19,15 @@ stdenv.mkDerivation rec { pname = "libvirt-glib"; - version = "4.0.0"; + version = "5.0.0"; outputs = [ "out" "dev" ] ++ lib.optional withDocs "devdoc"; src = fetchurl { url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; - sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; + sha256 = "m/7DRjgkFqNXXYcpm8ZBsqRkqlGf2bEofjGKpDovO4s="; }; - patches = [ - # Fix build with GLib 2.70 - (fetchpatch { - url = "https://gitlab.com/libvirt/libvirt-glib/-/commit/9a34c4ea55e0246c34896e48b8ecd637bc559ac7.patch"; - sha256 = "UU70uTi55EzPMuLYVKRzpVcd3WogeAtWAWEC2hWlR7k="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -69,9 +60,6 @@ stdenv.mkDerivation rec { (lib.mesonEnable "introspection" withIntrospection) ]; - # https://gitlab.com/libvirt/libvirt-glib/-/issues/4 - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=pointer-sign" ]; - meta = with lib; { description = "Library for working with virtual machines"; longDescription = '' |