mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 07:15:54 +03:00
flatpak: 1.14.4 → 1.14.5
https://github.com/flatpak/flatpak/compare/1.14.4...1.14.5 This contains build fix for AppStream 1.0.
This commit is contained in:
parent
e9ef8a102c
commit
9ed63709bc
@ -35,6 +35,7 @@ in {
|
||||
services.dbus.packages = [ pkgs.flatpak ];
|
||||
|
||||
systemd.packages = [ pkgs.flatpak ];
|
||||
systemd.tmpfiles.packages = [ pkgs.flatpak ];
|
||||
|
||||
environment.profiles = [
|
||||
"$HOME/.local/share/flatpak/exports"
|
||||
|
@ -7,6 +7,7 @@ makeInstalledTest {
|
||||
testConfig = {
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
xdg.portal.config.common.default = "gtk";
|
||||
services.flatpak.enable = true;
|
||||
environment.systemPackages = with pkgs; [ gnupg ostree python3 ];
|
||||
virtualisation.memorySize = 2047;
|
||||
|
@ -54,14 +54,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flatpak";
|
||||
version = "1.14.4";
|
||||
version = "1.14.5";
|
||||
|
||||
# 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-ijTb0LZ8Q051mLmOxpCVPQRvDbJuSArq+0bXKuxxZ5k="; # Taken from https://github.com/flatpak/flatpak/releases/
|
||||
sha256 = "sha256-W3DGTOesE04eoIARJW5COuXFTydyl0QVg/d9AT8n/6w="; # Taken from https://github.com/flatpak/flatpak/releases/
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -63,7 +63,7 @@ index afa11a6b..5b12055f 100755
|
||||
flatpak build-finish ${DIR} >&2
|
||||
mkdir -p repos
|
||||
diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
|
||||
index 4ba950df..fd50fab3 100755
|
||||
index 6345ff58..fd50fab3 100755
|
||||
--- a/tests/make-test-runtime.sh
|
||||
+++ b/tests/make-test-runtime.sh
|
||||
@@ -28,9 +28,10 @@ EOF
|
||||
@ -78,7 +78,7 @@ index 4ba950df..fd50fab3 100755
|
||||
mkdir -p ${DIR}/usr/bin
|
||||
mkdir -p ${DIR}/usr/lib
|
||||
ln -s ../lib ${DIR}/usr/lib64
|
||||
@@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then
|
||||
@@ -40,46 +41,17 @@ if test -f /sbin/ldconfig.real; then
|
||||
else
|
||||
cp "$(type -P ldconfig)" "${DIR}/usr/bin"
|
||||
fi
|
||||
@ -89,6 +89,12 @@ index 4ba950df..fd50fab3 100755
|
||||
- local f=$1
|
||||
- shift
|
||||
-
|
||||
- # Check if the program is installed
|
||||
- if ! command -v "${f}" &> /dev/null; then
|
||||
- echo "${f} not found"
|
||||
- exit 1
|
||||
- fi
|
||||
-
|
||||
- if grep -qFe "${f}" $BINS; then
|
||||
- # Already handled
|
||||
- return 0
|
||||
@ -129,7 +135,7 @@ index 4ba950df..fd50fab3 100755
|
||||
done
|
||||
ln -s bash ${DIR}/usr/bin/sh
|
||||
|
||||
@@ -84,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA"
|
||||
@@ -90,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA"
|
||||
EOF
|
||||
chmod a+x ${DIR}/usr/bin/runtime_hello.sh
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
|
||||
index 8fa8c0e0..e1cdeba0 100644
|
||||
index 6f54a9d0..102d9b90 100644
|
||||
--- a/common/flatpak-run.c
|
||||
+++ b/common/flatpak-run.c
|
||||
@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = {
|
||||
{"XKB_CONFIG_ROOT", NULL},
|
||||
{"GIO_EXTRA_MODULES", NULL},
|
||||
@@ -1902,6 +1902,7 @@ static const ExportData default_exports[] = {
|
||||
{"GDK_BACKEND", NULL},
|
||||
{"VK_DRIVER_FILES", NULL},
|
||||
{"VK_ICD_FILENAMES", NULL},
|
||||
+ {"GDK_PIXBUF_MODULE_FILE", NULL},
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user