diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-22 19:14:35 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-22 19:14:50 -0400 |
| commit | a0bb3dd8ac4fb1e0c5fa4b897b97b7b5e79a5f31 (patch) | |
| tree | d1b0e2c08efa919cc45e2b805208ca12eff7bfcd /pkgs/desktops/gnome-3/core | |
| parent | ed569c149267f7ab3e508de92939257d29bd2dfe (diff) | |
| download | nixpkgs-a0bb3dd8ac4fb1e0c5fa4b897b97b7b5e79a5f31.tar nixpkgs-a0bb3dd8ac4fb1e0c5fa4b897b97b7b5e79a5f31.tar.gz nixpkgs-a0bb3dd8ac4fb1e0c5fa4b897b97b7b5e79a5f31.tar.bz2 nixpkgs-a0bb3dd8ac4fb1e0c5fa4b897b97b7b5e79a5f31.tar.lz nixpkgs-a0bb3dd8ac4fb1e0c5fa4b897b97b7b5e79a5f31.tar.xz nixpkgs-a0bb3dd8ac4fb1e0c5fa4b897b97b7b5e79a5f31.tar.zst nixpkgs-a0bb3dd8ac4fb1e0c5fa4b897b97b7b5e79a5f31.zip | |
gnome3.gnome-control-center: hardcode path to gnome-desktop
This is needed for its gnome-version.xml so it can properly display the current gnome-desktop version in the info panel. Previously it was always "GNOME 3.0".
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 74f05012177..cfd20044c6c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./paths.patch; gcm = gnome-color-manager; + gnome_desktop = gnome-desktop; inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch index 589461d8040..97d8f0bee68 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch @@ -54,6 +54,19 @@ index 96b25140c..1ad704d4a 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index 4541986db..da7826bfe 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -187,7 +187,7 @@ load_gnome_version (char **version, + gsize length; + g_autoptr(VersionData) data = NULL; + +- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", ++ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", + &contents, + &length, + &error)) diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c index 9390a3308..d30b4a68e 100644 --- a/panels/network/connection-editor/net-connection-editor.c |