diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-09-02 10:36:08 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-11 18:52:20 +0200 |
commit | fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4 (patch) | |
tree | fec71348ce375d1b7c0c0d453a236c0520035afe | |
parent | 6a0555be7b77f8e4ee45c6321e7695e7df4c71dc (diff) | |
download | nixpkgs-fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4.tar nixpkgs-fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4.tar.gz nixpkgs-fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4.tar.bz2 nixpkgs-fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4.tar.lz nixpkgs-fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4.tar.xz nixpkgs-fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4.tar.zst nixpkgs-fab4cc66bd0a80bb1dfaf88d48d28352a9ae95d4.zip |
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>
-rw-r--r-- | pkgs/development/libraries/glib-networking/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/glib-networking/installed-tests-path.patch | 12 |
2 files changed, 11 insertions, 15 deletions
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 749bd14810e..9b913289c01 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , meson @@ -8,7 +9,6 @@ , glib , gettext , makeWrapper -, python3 , gnutls , p11-kit , libproxy @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.74.beta"; + version = "2.74.rc"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dI18G79OzOsP5yS5QUvSYdJ1KuU0PV+0e0MpYZQafAg="; + sha256 = "APLko2Hr6bEdrIVUYcot4OLEkMQYxwSZTYkaN5t4dWw="; }; patches = [ @@ -36,18 +36,12 @@ stdenv.mkDerivation rec { ./installed-tests-path.patch ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - nativeBuildInputs = [ meson ninja pkg-config gettext makeWrapper - python3 # for install_script ]; buildInputs = [ diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/pkgs/development/libraries/glib-networking/installed-tests-path.patch index 942ca053dd4..549307cca39 100644 --- a/pkgs/development/libraries/glib-networking/installed-tests-path.patch +++ b/pkgs/development/libraries/glib-networking/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 4d91677..aaaeb2b 100644 +index 01e18a9..5dbb2fc 100644 --- a/meson.build +++ b/meson.build -@@ -12,8 +12,8 @@ +@@ -12,8 +12,8 @@ libdir = join_paths(prefix, get_option('libdir')) libexecdir = join_paths(prefix, get_option('libexecdir')) localedir = join_paths(prefix, get_option('localedir')) @@ -14,12 +14,14 @@ index 4d91677..aaaeb2b 100644 cc = meson.get_compiler('c') host_system = host_machine.system() diff --git a/meson_options.txt b/meson_options.txt -index 3a525dd..fc86302 100644 +index c566ccd..80f7c33 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,4 +3,5 @@ +@@ -10,6 +10,7 @@ option('environment_proxy', type: 'feature', value: 'auto', description: 'suppor option('libproxy', type: 'feature', value: 'auto', description: 'support for libproxy proxy configration') option('gnome_proxy', type: 'feature', value: 'auto', description: 'support for GNOME desktop proxy configuration') option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') - option('static_modules', type: 'boolean', value: false, description: 'build static modules') + option('debug_logs', type: 'boolean', value: false, description: 'enable debug log messages (slow)') + + # Deprecated, use -Ddefault_library=static instead. |