pyrox.dev
lol
glib-networking: 2.74.beta → 2.74.rc
https://gitlab.gnome.org/GNOME/glib-networking/-/compare/2.74.beta...2.74.rc
Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
+4
-10
pkgs/development/libraries/glib-networking/default.nix
+4
-10
pkgs/development/libraries/glib-networking/default.nix
···
1
-
{ lib, stdenv
1
+
{ stdenv
2
+
, lib
2
3
, fetchurl
3
4
, substituteAll
4
5
, meson
···
8
9
, glib
9
10
, gettext
10
11
, makeWrapper
11
-
, python3
12
12
, gnutls
13
13
, p11-kit
14
14
, libproxy
···
18
18
19
19
stdenv.mkDerivation rec {
20
20
pname = "glib-networking";
21
-
version = "2.74.beta";
21
+
version = "2.74.rc";
22
22
23
23
outputs = [ "out" "installedTests" ];
24
24
25
25
src = fetchurl {
26
26
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27
-
sha256 = "dI18G79OzOsP5yS5QUvSYdJ1KuU0PV+0e0MpYZQafAg=";
27
+
sha256 = "APLko2Hr6bEdrIVUYcot4OLEkMQYxwSZTYkaN5t4dWw=";
28
28
};
29
29
30
30
patches = [
···
36
36
./installed-tests-path.patch
37
37
];
38
38
39
-
postPatch = ''
40
-
chmod +x meson_post_install.py # patchShebangs requires executable file
41
-
patchShebangs meson_post_install.py
42
-
'';
43
-
44
39
nativeBuildInputs = [
45
40
meson
46
41
ninja
47
42
pkg-config
48
43
gettext
49
44
makeWrapper
50
-
python3 # for install_script
51
45
];
52
46
53
47
buildInputs = [
+7
-5
pkgs/development/libraries/glib-networking/installed-tests-path.patch
+7
-5
pkgs/development/libraries/glib-networking/installed-tests-path.patch
···
1
1
diff --git a/meson.build b/meson.build
2
-
index 4d91677..aaaeb2b 100644
2
+
index 01e18a9..5dbb2fc 100644
3
3
--- a/meson.build
4
4
+++ b/meson.build
5
-
@@ -12,8 +12,8 @@
5
+
@@ -12,8 +12,8 @@ libdir = join_paths(prefix, get_option('libdir'))
6
6
libexecdir = join_paths(prefix, get_option('libexecdir'))
7
7
localedir = join_paths(prefix, get_option('localedir'))
8
8
···
14
14
cc = meson.get_compiler('c')
15
15
host_system = host_machine.system()
16
16
diff --git a/meson_options.txt b/meson_options.txt
17
-
index 3a525dd..fc86302 100644
17
+
index c566ccd..80f7c33 100644
18
18
--- a/meson_options.txt
19
19
+++ b/meson_options.txt
20
-
@@ -3,4 +3,5 @@
20
+
@@ -10,6 +10,7 @@ option('environment_proxy', type: 'feature', value: 'auto', description: 'suppor
21
21
option('libproxy', type: 'feature', value: 'auto', description: 'support for libproxy proxy configration')
22
22
option('gnome_proxy', type: 'feature', value: 'auto', description: 'support for GNOME desktop proxy configuration')
23
23
option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests')
24
24
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
25
-
option('static_modules', type: 'boolean', value: false, description: 'build static modules')
25
+
option('debug_logs', type: 'boolean', value: false, description: 'enable debug log messages (slow)')
26
+
27
+
# Deprecated, use -Ddefault_library=static instead.