b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #170479 from mvnetbiz/gnome-secrets

Browse source 
gnome-secrets: 6.1 -> 6.4
This commit is contained in:
Guillaume Girol 2022-04-29 18:46:46 +00:00 committed by GitHub
parent 03e1b22740 770ef9e27f
commit 782dc512f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/misc/gnome-secrets/default.nix
View file

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