pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

flatpak-builder: 1.0.10 → 1.0.11

https://github.com/flatpak/flatpak-builder/releases/tag/1.0.11

Also try to fix: https://github.com/NixOS/nixpkgs/issues/73325

Jan Tojnar 0e4bdc9f 8d057721

+31 -8
+5 -3
pkgs/development/tools/flatpak-builder/default.nix
··· 46 46 installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; 47 47 in stdenv.mkDerivation rec { 48 48 pname = "flatpak-builder"; 49 - version = "1.0.10"; 49 + version = "1.0.11"; 50 50 51 51 outputs = [ "out" "doc" "man" "installedTests" ]; 52 52 53 53 src = fetchurl { 54 54 url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; 55 - sha256 = "1fn61cl1d33yd1jgqm8jpffjw3xlyyhkn032g14d9gnwkcaf4649"; 55 + sha256 = "EYNLdrvSs8S/GCYy0jGsnP1+C988y1j7WzcLfczM1Ew="; 56 56 }; 57 57 58 58 nativeBuildInputs = [ ··· 87 87 patches = [ 88 88 # patch taken from gtk_doc 89 89 ./respect-xml-catalog-files-var.patch 90 + 91 + # Hardcode paths 90 92 (substituteAll { 91 93 src = ./fix-paths.patch; 92 - bzr = "${breezy}/bin/bzr"; 94 + brz = "${breezy}/bin/brz"; 93 95 cp = "${coreutils}/bin/cp"; 94 96 patch = "${patch}/bin/patch"; 95 97 tar = "${gnutar}/bin/tar";
+26 -5
pkgs/development/tools/flatpak-builder/fix-paths.patch
··· 1 + diff --git a/src/builder-context.c b/src/builder-context.c 2 + index dde12790..3a379297 100644 1 3 --- a/src/builder-context.c 2 4 +++ b/src/builder-context.c 5 + @@ -256,7 +256,7 @@ builder_context_init (BuilderContext *self) 6 + g_autofree char *path = NULL; 7 + 8 + self->rofiles_file_lock = init; 9 + - path = g_find_program_in_path ("rofiles-fuse"); 10 + + path = g_find_program_in_path ("@rofilesfuse@"); 11 + self->have_rofiles = path != NULL; 12 + } 13 + 3 14 @@ -800,7 +800,7 @@ builder_context_enable_rofiles (BuilderContext *self, 4 15 g_autoptr(GFile) rofiles_base = NULL; 5 16 g_autoptr(GFile) rofiles_dir = NULL; ··· 9 20 "-o", 10 21 "kernel_cache,entry_timeout=60,attr_timeout=60,splice_write,splice_move", 11 22 (char *)flatpak_file_get_path_cached (self->app_dir), 23 + diff --git a/src/builder-git.c b/src/builder-git.c 24 + index ef517adb..6ab095f0 100644 12 25 --- a/src/builder-git.c 13 26 +++ b/src/builder-git.c 14 27 @@ -44,7 +44,7 @@ git (GFile *dir, ··· 29 42 va_end (ap); 30 43 31 44 return res; 45 + diff --git a/src/builder-source-archive.c b/src/builder-source-archive.c 46 + index 3c694e57..0de62318 100644 32 47 --- a/src/builder-source-archive.c 33 48 +++ b/src/builder-source-archive.c 34 49 @@ -443,7 +443,7 @@ tar (GFile *dir, ··· 67 82 va_end (ap); 68 83 69 84 return res; 85 + diff --git a/src/builder-source-bzr.c b/src/builder-source-bzr.c 86 + index ceeec94a..8abe6f53 100644 70 87 --- a/src/builder-source-bzr.c 71 88 +++ b/src/builder-source-bzr.c 72 89 @@ -124,7 +124,7 @@ bzr (GFile *dir, 90 + gboolean res; 73 91 va_list ap; 74 92 93 + - brz = g_find_program_in_path ("brz"); 94 + + brz = g_find_program_in_path ("@brz@"); 95 + 75 96 va_start (ap, error); 76 - - res = flatpak_spawn (dir, output, 0, error, "bzr", ap); 77 - + res = flatpak_spawn (dir, output, 0, error, "@bzr@", ap); 78 - va_end (ap); 79 - 80 - return res; 97 + res = flatpak_spawn (dir, output, 0, error, brz ? brz : "bzr", ap); 98 + diff --git a/src/builder-source-patch.c b/src/builder-source-patch.c 99 + index 8721e1e4..d7f4d840 100644 81 100 --- a/src/builder-source-patch.c 82 101 +++ b/src/builder-source-patch.c 83 102 @@ -247,15 +247,15 @@ patch (GFile *dir, ··· 99 118 } 100 119 for (i = 0; extra_options != NULL && extra_options[i] != NULL; i++) 101 120 g_ptr_array_add (args, (gchar *) extra_options[i]); 121 + diff --git a/src/builder-utils.c b/src/builder-utils.c 122 + index f1c06db5..2e3347c5 100644 102 123 --- a/src/builder-utils.c 103 124 +++ b/src/builder-utils.c 104 125 @@ -149,7 +149,7 @@ strip (GError **error,