Merge pull request #170479 from mvnetbiz/gnome-secrets

gnome-secrets: 6.1 -> 6.4
This commit is contained in:
Guillaume Girol 2022-04-29 18:46:46 +00:00 committed by GitHub
commit 782dc512f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,7 +5,6 @@
, gettext
, fetchFromGitLab
, python3Packages
, libpwquality
, wrapGAppsHook4
, gtk4
, glib
@ -17,7 +16,7 @@
python3Packages.buildPythonApplication rec {
pname = "gnome-secrets";
version = "6.1";
version = "6.4";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@ -26,7 +25,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = "secrets";
rev = version;
sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8=";
sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU=";
};
nativeBuildInputs = [
@ -45,6 +44,7 @@ python3Packages.buildPythonApplication rec {
glib
gdk-pixbuf
libadwaita
python3Packages.libpwquality.dev # Use python-enabled libpwquality
];
propagatedBuildInputs = with python3Packages; [
@ -52,14 +52,9 @@ python3Packages.buildPythonApplication rec {
construct
pykeepass
pyotp
] ++ [
libpwquality # using the python bindings
libpwquality
];
postPatch = ''
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache";
'';
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
dontWrapGApps = true;
@ -76,4 +71,3 @@ python3Packages.buildPythonApplication rec {
maintainers = with maintainers; [ mvnetbiz ];
};
}