pyrox.dev / nixpkgs
lol
fork atom

libgovirt: 0.3.8 -> 0.3.9

Also switched to the meson+ninja

Atemu d8ed5557 81b57078

+31 -31
unified split
+12
pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch
··· 1 + diff --git a/meson.build b/meson.build 2 + index d5c3627..2bd692a 100644 3 + --- a/meson.build 4 + +++ b/meson.build 5 + @@ -86,7 +86,7 @@ govirt_global_cflags = ['-std=c99', 6 + '-Woverride-init', 7 + '-Wno-unused-parameter'] 8 + 9 + -foreach arg : govirt_global_cflags 10 + +foreach arg : compiler.get_supported_arguments(govirt_global_cflags) 11 + add_project_arguments(arg, language : 'c') 12 + endforeach
+19 -17
pkgs/applications/virtualization/libgovirt/default.nix
··· 1 1 { lib 2 2 , stdenv 3 - , fetchurl 4 - , glib 3 + , fetchzip 5 4 , gnome 6 - , librest 7 - , libsoup 5 + , meson 8 6 , pkg-config 9 7 , gobject-introspection 8 + , ninja 9 + , glib 10 + , librest_1_0 10 11 }: 11 12 12 13 stdenv.mkDerivation rec { 13 14 pname = "libgovirt"; 14 - version = "0.3.8"; 15 + version = "0.3.9"; 15 16 16 17 outputs = [ "out" "dev" ]; 17 18 18 - src = fetchurl { 19 + src = fetchzip { 19 20 url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 20 - sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; 21 + sha256 = "sha256-6RDuJTyaVYlO4Kq+niQyepom6xj1lqdBbyWL/VnZUdk="; 21 22 }; 22 23 23 - patches = lib.optionals stdenv.isDarwin [ 24 - # The flag breaks the build on darwin and doesn't seem necessary 25 - ./no-version-script-ld-flag.patch 24 + patches = [ 25 + # https://gitlab.gnome.org/GNOME/libgovirt/-/issues/9 26 + ./auto-disable-incompatible-compiler-warnings.patch 26 27 ]; 28 + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (lib.concatStringsSep " " [ 29 + "-Wno-typedef-redefinition" 30 + "-Wno-missing-field-initializers" 31 + "-Wno-cast-align" 32 + ]); 27 33 28 34 nativeBuildInputs = [ 35 + meson 29 36 pkg-config 30 37 gobject-introspection 31 - ]; 32 - 33 - buildInputs = [ 34 - libsoup 38 + ninja 35 39 ]; 36 40 37 41 propagatedBuildInputs = [ 38 42 glib 39 - librest 43 + librest_1_0 40 44 ]; 41 - 42 - enableParallelBuilding = true; 43 45 44 46 passthru = { 45 47 updateScript = gnome.updateScript {
-14
pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch
··· 1 - --- a/govirt/Makefile.in 2 - +++ b/govirt/Makefile.in 3 - @@ -511,8 +511,7 @@ 4 - libgovirt_la_LDFLAGS = \ 5 - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ 6 - -export-dynamic \ 7 - - -no-undefined \ 8 - - -Wl,--version-script=$(srcdir)/govirt.sym 9 - + -no-undefined 10 - 11 - libgovirt_la_CFLAGS = \ 12 - $(WARNINGFLAGS_C) 13 - 14 - Diff finished. Fri Oct 28 10:36:38 2022