diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glib-networking')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glib-networking/default.nix | 17 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glib-networking/installed-tests-path.patch | 12 |
2 files changed, 15 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 489e92648a99..35091bcbcfcd 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , meson @@ -8,23 +9,23 @@ , glib , gettext , makeWrapper -, python3 , gnutls , p11-kit , libproxy , gnome , gsettings-desktop-schemas +, bash }: stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.72.2"; + version = "2.76.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "zSoITHu5HXjoSftV1A5HL22PaGLN3J8Sw5FJNZuhgmg="; + sha256 = "FJoFoXnmKaU4viVmKqMktJnXxFScUVHbU3PngKG/G5o="; }; patches = [ @@ -36,10 +37,7 @@ stdenv.mkDerivation rec { ./installed-tests-path.patch ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; + strictDeps = true; nativeBuildInputs = [ meson @@ -47,7 +45,7 @@ stdenv.mkDerivation rec { pkg-config gettext makeWrapper - python3 # for install_script + glib # for gio-querymodules ]; buildInputs = [ @@ -56,6 +54,7 @@ stdenv.mkDerivation rec { p11-kit libproxy gsettings-desktop-schemas + bash # installed-tests shebangs ]; doCheck = false; # tests need to access the certificates (among other things) diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/glib-networking/installed-tests-path.patch index 942ca053dd4f..549307cca39d 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/installed-tests-path.patch +++ b/nixpkgs/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. |