movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #327361 from arthsmn/flatpak-builder-update

Browse source
This commit is contained in:
Sandro 2024-07-16 13:55:12 +02:00 • committed by GitHub
commit 11964fa63e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/tests/installed-tests/flatpak-builder.nix
View file

@ -5,8 +5,11 @@ makeInstalledTest {
testConfig = { testConfig = {
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal.enable = true; xdg.portal = {
xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; enable = true;
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
config.common.default = "gtk";
};
environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies; environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
virtualisation.diskSize = 2048; virtualisation.diskSize = 2048;
}; };

15
pkgs/development/tools/flatpak-builder/default.nix
View file

@ -41,19 +41,16 @@
, attr , attr
}: }:
let stdenv.mkDerivation (finalAttrs: {
installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
in stdenv.mkDerivation (finalAttrs: {
pname = "flatpak-builder"; pname = "flatpak-builder";
version = "1.4.2"; version = "1.4.4";
outputs = [ "out" "doc" "man" "installedTests" ]; outputs = [ "out" "doc" "man" "installedTests" ];
# fetchFromGitHub fetches an archive which does not contain the full source (https://github.com/flatpak/flatpak-builder/issues/558) # fetchFromGitHub fetches an archive which does not contain the full source (https://github.com/flatpak/flatpak-builder/issues/558)
src = fetchurl { src = fetchurl {
# TODO: remove the '-fixed-libglnx' in the next release url = "https://github.com/flatpak/flatpak-builder/releases/download/${finalAttrs.version}/flatpak-builder-${finalAttrs.version}.tar.xz";
url = "https://github.com/flatpak/flatpak-builder/releases/download/${finalAttrs.version}/flatpak-builder-${finalAttrs.version}-fixed-libglnx.tar.xz"; hash = "sha256-3CcVk5S6qiy1I/Uvh0Ry/1DRYZgyMyZMoqIuhQdB7Ho=";
hash = "sha256-wEG5dOA6LC082oig7+Hs9p+a30KhdY6sNB1VXnedBZY=";
}; };
patches = [ patches = [
@ -124,7 +121,9 @@ in stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true; enableParallelBuilding = true;
# Installed tests # Installed tests
postFixup = '' postFixup = let
installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
in ''
for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh,test-builder-deprecated.sh}; do for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh,test-builder-deprecated.sh}; do
patchShebangs $file patchShebangs $file
done done