Commit 623174dc authored by Jan Tojnar's avatar Jan Tojnar
Browse files

gnome.gnome-control-center: 42.3 → 43.alpha

parent 056bbc49
Loading
Loading
Loading
Loading
+2 −13
Original line number Diff line number Diff line
@@ -63,18 +63,17 @@

stdenv.mkDerivation rec {
  pname = "gnome-control-center";
  version = "42.3";
  version = "43.alpha";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
    sha256 = "sha256-zgrjZQ3ir368sKfh/JkS7dtu/40lfz/lD/iynBk0HH4=";
    sha256 = "sha256-Tcdvb4qrgY3ybL5bAlZ134HkkjEAORco9my2y0xFjz4=";
  };

  patches = [
    (substituteAll {
      src = ./paths.patch;
      gcm = gnome-color-manager;
      gnome_desktop = gnome-desktop;
      inherit glibc libgnomekbd tzdata;
      inherit cups networkmanagerapplet;
    })
@@ -135,16 +134,6 @@ stdenv.mkDerivation rec {
    upower
  ];

  # postPatch = ''
  #   scriptsToPatch=(
  #     build-aux/meson/meson_post_install.py
  #     build-aux/meson/find_xdg_file.py
  #   )
  #   # # patchShebangs requires executable file
  #   # chmod +x "''${scriptsToPatch[@]}"
  #   # patchShebangs "''${scriptsToPatch[@]}"
  # '';

  preConfigure = ''
    # For ITS rules
    addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share"
+0 −13
Original line number Diff line number Diff line
@@ -54,19 +54,6 @@ index a2376f8a4..98769e08f 100644
 
 typedef struct _TzDB TzDB;
 typedef struct _TzLocation TzLocation;
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index bd0e07762..0e71351f8 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -172,7 +172,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/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c
index 6c2cb5614..8f57159cc 100644
--- a/panels/keyboard/cc-input-list-box.c