tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
libgovirt: 0.3.8 -> 0.3.9
Also switched to the meson+ninja
Atemu
3 years ago
d8ed5557
81b57078
+31
-31
3 changed files
expand all
collapse all
unified
split
pkgs
applications
virtualization
libgovirt
auto-disable-incompatible-compiler-warnings.patch
default.nix
no-version-script-ld-flag.patch
+12
pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
···
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
{ lib
2
, stdenv
3
-
, fetchurl
4
-
, glib
5
, gnome
6
-
, librest
7
-
, libsoup
8
, pkg-config
9
, gobject-introspection
0
0
0
10
}:
11
12
stdenv.mkDerivation rec {
13
pname = "libgovirt";
14
-
version = "0.3.8";
15
16
outputs = [ "out" "dev" ];
17
18
-
src = fetchurl {
19
url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
20
-
sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg=";
21
};
22
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
26
];
0
0
0
0
0
27
28
nativeBuildInputs = [
0
29
pkg-config
30
gobject-introspection
31
-
];
32
-
33
-
buildInputs = [
34
-
libsoup
35
];
36
37
propagatedBuildInputs = [
38
glib
39
-
librest
40
];
41
-
42
-
enableParallelBuilding = true;
43
44
passthru = {
45
updateScript = gnome.updateScript {
···
1
{ lib
2
, stdenv
3
+
, fetchzip
0
4
, gnome
5
+
, meson
0
6
, pkg-config
7
, gobject-introspection
8
+
, ninja
9
+
, glib
10
+
, librest_1_0
11
}:
12
13
stdenv.mkDerivation rec {
14
pname = "libgovirt";
15
+
version = "0.3.9";
16
17
outputs = [ "out" "dev" ];
18
19
+
src = fetchzip {
20
url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
21
+
sha256 = "sha256-6RDuJTyaVYlO4Kq+niQyepom6xj1lqdBbyWL/VnZUdk=";
22
};
23
24
+
patches = [
25
+
# https://gitlab.gnome.org/GNOME/libgovirt/-/issues/9
26
+
./auto-disable-incompatible-compiler-warnings.patch
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
+
]);
33
34
nativeBuildInputs = [
35
+
meson
36
pkg-config
37
gobject-introspection
38
+
ninja
0
0
0
39
];
40
41
propagatedBuildInputs = [
42
glib
43
+
librest_1_0
44
];
0
0
45
46
passthru = {
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
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0