nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome3.gnome-initial-setup: 3.38.4 → 40.1

Browse Source 
- gnome-tour is now launched by shell https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/120
This commit is contained in:
Jan Tojnar 2021-03-21 06:15:46 +01:00
parent 3d77574556
commit 0fab0780f0
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch
View File

@ -5,29 +5,10 @@ Date: Sun, 20 Sep 2020 14:46:59 -0400
Subject: [PATCH] fix paths
---
data/gnome-welcome-tour | 4 ++--
gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++---
gnome-initial-setup/pages/timezone/tz.h | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
index 51c9b59..68ab0c4 100755
--- a/data/gnome-welcome-tour
+++ b/data/gnome-welcome-tour
@@ -3,11 +3,11 @@
cfgdir=${XDG_CONFIG_DIR:-$HOME/.config}
# Don't do anything if gnome-tour isn't installed
-gnome_tour_path=$(which gnome-tour 2>/dev/null)
+gnome_tour_path="@gnome_tour@"
if test -z "${gnome_tour_path}"; then
rm -f $cfgdir/run-welcome-tour
exit
fi
-gnome-tour
+@gnome_tour@
rm -f $cfgdir/run-welcome-tour
diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
index 196abf6..613d0e5 100644
--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c

24
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View File

@ -14,7 +14,6 @@
, geocode-glib
, glib
, gnome-desktop
, gnome-getting-started-docs
, gnome-online-accounts
, gtk3
, libgweather
@ -32,18 +31,24 @@
, tzdata
, libgnomekbd
, gsettings-desktop-schemas
, gnome-tour
}:
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "3.38.4";
version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "001jdzsvc541qracn68r609pr5qwymrh85xrqmvzzc1dbg5w3mlg";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi";
};
patches = [
(substituteAll {
src = ./0001-fix-paths.patch;
inherit tzdata libgnomekbd;
})
];
nativeBuildInputs = [
gettext
meson
@ -61,7 +66,6 @@ stdenv.mkDerivation rec {
geocode-glib
glib
gnome-desktop
gnome-getting-started-docs
gnome-online-accounts
gsettings-desktop-schemas
gtk3
@ -78,14 +82,6 @@ stdenv.mkDerivation rec {
webkitgtk
];
patches = [
(substituteAll {
src = ./0001-fix-paths.patch;
inherit tzdata libgnomekbd;
gnome_tour = "${gnome-tour}/bin/gnome-tour";
})
];
mesonFlags = [
"-Dcheese=disabled"
"-Dibus=disabled"