diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index e20ad1c954d1..c540f4bc26ec 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "libaccounts-glib"; - version = "1.24"; + version = "1.26"; outputs = [ "out" "dev" "devdoc" "py" ]; @@ -11,12 +11,9 @@ stdenv.mkDerivation rec { owner = "accounts-sso"; repo = "libaccounts-glib"; rev = version; - sha256 = "0y8smg1rd279lrr9ad8b499i8pbkajmwd4xn41rdh9h93hs9apn7"; + sha256 = "sha256-KVKylt+XjLfidsS2KzT7oFXP6rTR528lYAUP8dffu7k="; }; - # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22 - patches = [ ./py-override.patch ]; - nativeBuildInputs = [ check docbook_xml_dtd_43 diff --git a/pkgs/development/libraries/libaccounts-glib/py-override.patch b/pkgs/development/libraries/libaccounts-glib/py-override.patch deleted file mode 100644 index 4179f4fa0af0..000000000000 --- a/pkgs/development/libraries/libaccounts-glib/py-override.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/libaccounts-glib/pygobject/meson.build b/libaccounts-glib/pygobject/meson.build -index fa1f4a0..588c4ce 100644 ---- a/libaccounts-glib/pygobject/meson.build -+++ b/libaccounts-glib/pygobject/meson.build -@@ -1,11 +1,19 @@ --python3 = import('python3') --python_exec = python3.find_python() --python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))']) -+py_override = get_option('py-overrides-dir') - --if python_exec_result.returncode() != 0 -- error('Failed to retreive the python GObject override directory') -+if py_override == '' -+ python3 = import('python3') -+ python_exec = python3.find_python() -+ -+ python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))']) -+ -+ if python_exec_result.returncode() != 0 -+ error('Failed to retreive the python GObject override directory') -+ endif -+ -+ py_override = python_exec_result.stdout().strip() - endif - --install_data('Accounts.py', -- install_dir: join_paths(python_exec_result.stdout().strip()) -+install_data( -+ 'Accounts.py', -+ install_dir: py_override - ) -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..2c33804 ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1 @@ -+option('py-overrides-dir', type : 'string', value : '', description: 'Path to pygobject overrides directory')