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

gnome3.gnome-control-center: 3.34.2 -> 3.34.4 

* hardcode usermod which was added absolute this release
This commit is contained in:
worldofpeace 2020-02-18 07:39:25 -05:00
parent a5000f07a6
commit 1de94d59af
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,16 +62,17 @@
, vino , vino
, gnome-user-share , gnome-user-share
, gnome-remote-desktop , gnome-remote-desktop
, shadow
, wrapGAppsHook , wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-control-center"; pname = "gnome-control-center";
version = "3.34.2"; version = "3.34.4";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "054igagvmyzpaa5nwzz98gv7bk7l5dwp6g813707132si3szlpx8"; sha256 = "0bi7lsmr5hcf0v17brsa8j33p6i0wnh620bzwycmxryfp6s6vshp";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -138,6 +139,7 @@ stdenv.mkDerivation rec {
(substituteAll { (substituteAll {
src = ./paths.patch; src = ./paths.patch;
gcm = gnome-color-manager; gcm = gnome-color-manager;
usermod = "${shadow}/bin/usermod";
gnome_desktop = gnome-desktop; gnome_desktop = gnome-desktop;
inherit glibc libgnomekbd tzdata; inherit glibc libgnomekbd tzdata;
inherit cups networkmanagerapplet; inherit cups networkmanagerapplet;

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

@ -55,7 +55,7 @@ index 96b25140c..1ad704d4a 100644
typedef struct _TzDB TzDB; typedef struct _TzDB TzDB;
typedef struct _TzLocation TzLocation; typedef struct _TzLocation TzLocation;
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
index 4541986db..da7826bfe 100644 index 7fce8691e..b839f8b69 100644
--- a/panels/info/cc-info-overview-panel.c --- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info/cc-info-overview-panel.c +++ b/panels/info/cc-info-overview-panel.c
@@ -187,7 +187,7 @@ load_gnome_version (char **version, @@ -187,7 +187,7 @@ load_gnome_version (char **version,
@ -84,10 +84,10 @@ index 9390a3308..d30b4a68e 100644
} }
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 360fbfc72..870157a11 100644 index dd99a7485..4baa88a4e 100644
--- a/panels/network/net-device-wifi.c --- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c +++ b/panels/network/net-device-wifi.c
@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object) @@ -1445,7 +1445,7 @@ device_wifi_edit (NetObject *object)
return; return;
} }
uuid = nm_connection_get_uuid (NM_CONNECTION (connection)); uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
@ -123,10 +123,10 @@ index f53ba217e..d24bcaeb9 100644
/* Use SNMP to get printer's informations */ /* Use SNMP to get printer's informations */
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 35859526d..21486c917 100644 index e0604b8c3..fc323c1b2 100644
--- a/panels/region/cc-region-panel.c --- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c +++ b/panels/region/cc-region-panel.c
@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self, @@ -763,10 +763,10 @@ row_layout_cb (CcRegionPanel *self,
layout_variant = cc_input_source_get_layout_variant (source); layout_variant = cc_input_source_get_layout_variant (source);
if (layout_variant && layout_variant[0]) if (layout_variant && layout_variant[0])
@ -140,7 +140,7 @@ index 35859526d..21486c917 100644
g_spawn_command_line_async (commandline, NULL); g_spawn_command_line_async (commandline, NULL);
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
index 00239ce0f..617c98870 100644 index 19934f186..9f41a9620 100644
--- a/panels/user-accounts/run-passwd.c --- a/panels/user-accounts/run-passwd.c
+++ b/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c
@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) @@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
@ -152,6 +152,19 @@ index 00239ce0f..617c98870 100644
argv[1] = NULL; argv[1] = NULL;
envp = g_get_environ (); 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] = "@usermod@";
argv[1] = "--login";
argv[2] = data->username;
argv[3] = "--";
diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
index 9cb92007a..84d2f0fa3 100644 index 9cb92007a..84d2f0fa3 100644
--- a/tests/datetime/test-endianess.c --- a/tests/datetime/test-endianess.c