colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome.gnome-control-center: Re-apply fix for hardcode usermod

Browse Source 
To keep this consistent with accountsservice and budgie-control-center,
assuming it has no harm.

https://github.com/NixOS/nixpkgs/pull/216737/files#r1109247859
This commit is contained in:
Bobby Rong 2023-04-22 17:39:05 +08:00
parent 077052e040
commit 611e58030c
No known key found for this signature in database
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/gnome/core/gnome-control-center/default.nix
View File

@ -49,6 +49,7 @@
, polkit
, python3
, samba
, shadow
, shared-mime-info
, sound-theme-freedesktop
, tracker
@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
(substituteAll {
src = ./paths.patch;
gcm = gnome-color-manager;
inherit glibc libgnomekbd tzdata;
inherit glibc libgnomekbd tzdata shadow;
inherit cups networkmanagerapplet;
})
];

13
pkgs/desktops/gnome/core/gnome-control-center/paths.patch
View File

@ -166,6 +166,19 @@ index 86f53d4fc..0b052856f 100644
argv[1] = NULL;
envp = g_get_environ ();
diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c
index 83d4cd091..e8784c722 100644
--- a/panels/user-accounts/user-utils.c
+++ b/panels/user-accounts/user-utils.c
@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username,
* future, so it would be nice to have some official way for this
* instead of relying on the current "--login" implementation.
*/
- argv[0] = "/usr/sbin/usermod";
+ argv[0] = "@shadow@/bin/usermod";
argv[1] = "--login";
argv[2] = data->username;
argv[3] = "--";
diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
index 9cb92007a..84d2f0fa3 100644
--- a/tests/datetime/test-endianess.c