diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-05 00:47:52 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 21:34:22 +0100 |
| commit | fd24e60d86177a50b3edb9107fb3c47dcca2bf17 (patch) | |
| tree | d5680ca0d240da5c2267d4f14c881356f86dec48 /pkgs/desktops | |
| parent | dbddbb263504b0fa068a81319562f7ea3a669a17 (diff) | |
| download | nixlib-fd24e60d86177a50b3edb9107fb3c47dcca2bf17.tar nixlib-fd24e60d86177a50b3edb9107fb3c47dcca2bf17.tar.gz nixlib-fd24e60d86177a50b3edb9107fb3c47dcca2bf17.tar.bz2 nixlib-fd24e60d86177a50b3edb9107fb3c47dcca2bf17.tar.lz nixlib-fd24e60d86177a50b3edb9107fb3c47dcca2bf17.tar.xz nixlib-fd24e60d86177a50b3edb9107fb3c47dcca2bf17.tar.zst nixlib-fd24e60d86177a50b3edb9107fb3c47dcca2bf17.zip | |
gnome3.gnome-session: 3.28.1 → 3.30.1
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-session/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 973613b3319e..ceda3dfd56fa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-session-${version}"; - version = "3.28.1"; + version = "3.30.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq"; + sha256 = "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa"; }; patches = [ @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { ''; preFixup = '' - for desktopFile in $(grep -rl "Exec=gnome-session" $out/share) - do - echo "Patching gnome-session path in: $desktopFile" - sed -i "s,Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile - done wrapProgram "$out/bin/gnome-session" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch index 3c56fd730e44..c1b5ebe842f9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch @@ -1,11 +1,11 @@ --- a/gnome-session/gnome-session.in +++ b/gnome-session/gnome-session.in -@@ -13,7 +13,7 @@ +@@ -13,7 +13,7 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && fi fi --SETTING=$(gsettings get org.gnome.system.locale region) -+SETTING=$(@gsettings@ get org.gnome.system.locale region) +-SETTING=$(G_MESSAGES_DEBUG= gsettings get org.gnome.system.locale region) ++SETTING=$(G_MESSAGES_DEBUG= @gsettings@ get org.gnome.system.locale region) REGION=${SETTING#\'} REGION=${REGION%\'} |