Merge pull request #206248 from jtojnar/flatpak
flatpak: 1.14.0 → 1.14.1
This commit is contained in:
commit
0ec294ab03
@ -54,14 +54,14 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "flatpak";
|
pname = "flatpak";
|
||||||
version = "1.14.0";
|
version = "1.14.1";
|
||||||
|
|
||||||
# TODO: split out lib once we figure out what to do with triggerdir
|
# TODO: split out lib once we figure out what to do with triggerdir
|
||||||
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
|
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
|
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 = [
|
patches = [
|
||||||
@ -89,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
# https://github.com/NixOS/nixpkgs/issues/53441
|
# https://github.com/NixOS/nixpkgs/issues/53441
|
||||||
./unset-env-vars.patch
|
./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
|
# 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.
|
# and cannot bind FHS paths since those are not available on NixOS.
|
||||||
finalAttrs.passthru.icon-validator-patch
|
finalAttrs.passthru.icon-validator-patch
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
--- 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
|
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "xdg-desktop-portal";
|
pname = "xdg-desktop-portal";
|
||||||
version = "1.15.0";
|
version = "1.16.0";
|
||||||
|
|
||||||
outputs = [ "out" "installedTests" ];
|
outputs = [ "out" "installedTests" ];
|
||||||
|
|
||||||
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
owner = "flatpak";
|
owner = "flatpak";
|
||||||
repo = "xdg-desktop-portal";
|
repo = "xdg-desktop-portal";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc=";
|
sha256 = "sha256-5VNauinTvZrSaQzyP/quL/3p2RPcTJUDLscEQMJpvYA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
Loading…
Reference in New Issue
Block a user