Unverified Commit 0ec294ab authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #206248 from jtojnar/flatpak

flatpak: 1.14.0 → 1.14.1
parents ff17e998 94cc90f0
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -54,14 +54,14 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "flatpak";
  version = "1.14.0";
  version = "1.14.1";

  # TODO: split out lib once we figure out what to do with triggerdir
  outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];

  src = fetchurl {
    url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
    sha256 = "sha256-jidpc3cOok3fJZetSuzTa5g5PmvekeSOF0OqymfyeBU="; # Taken from https://github.com/flatpak/flatpak/releases/
    sha256 = "sha256-CjyCM0MBjMWJhrbIJUVgnIzb8Pul8B2IMHvRSstd058="; # Taken from https://github.com/flatpak/flatpak/releases/
  };

  patches = [
@@ -89,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
    # https://github.com/NixOS/nixpkgs/issues/53441
    ./unset-env-vars.patch

    # Do not clear XDG_DATA_DIRS in fish shell
    # https://github.com/flatpak/flatpak/pull/5123
    ./no-breaking-fish.patch

    # The icon validator needs to access the gdk-pixbuf loaders in the Nix store
    # and cannot bind FHS paths since those are not available on NixOS.
    finalAttrs.passthru.icon-validator-patch
+0 −11
Original line number Diff line number Diff line
--- a/profile/flatpak.fish
+++ b/profile/flatpak.fish
@@ -1,7 +1,7 @@
 if type -q flatpak
     # Set XDG_DATA_DIRS to include Flatpak installations
 
-    set -x --path XDG_DATA_DIRS
+    set -x --path XDG_DATA_DIRS $XDG_DATA_DIRS
 
     set -q XDG_DATA_DIRS[1]; or set XDG_DATA_DIRS /usr/local/share /usr/share
     set -q XDG_DATA_HOME; or set -l XDG_DATA_HOME $HOME/.local/share
+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "xdg-desktop-portal";
  version = "1.15.0";
  version = "1.16.0";

  outputs = [ "out" "installedTests" ];

@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "flatpak";
    repo = "xdg-desktop-portal";
    rev = finalAttrs.version;
    sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc=";
    sha256 = "sha256-5VNauinTvZrSaQzyP/quL/3p2RPcTJUDLscEQMJpvYA=";
  };

  patches = [