JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #111613 from jtojnar/flatpak-1.10

Browse Source 
flatpak: 1.8.2 → 1.10.1
This commit is contained in:
Jan Tojnar 2021-02-02 17:51:33 +01:00 committed by GitHub
commit 410bbd828c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/development/libraries/flatpak/default.nix
View File

@ -1,12 +1,8 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, fetchpatch , autoreconfHook
, autoconf
, automake
, libtool
, docbook_xml_dtd_412 , docbook_xml_dtd_412
, docbook_xml_dtd_42 , docbook_xml_dtd_45
, docbook_xml_dtd_43
, docbook-xsl-nons , docbook-xsl-nons
, which , which
, libxml2 , libxml2
@ -49,7 +45,7 @@
, xorg , xorg
, valgrind , valgrind
, glib-networking , glib-networking
, wrapGAppsHook , wrapGAppsNoGuiHook
, dconf , dconf
, gsettings-desktop-schemas , gsettings-desktop-schemas
, librsvg , librsvg
@ -57,14 +53,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flatpak"; pname = "flatpak";
version = "1.8.2"; version = "1.10.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/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA="; sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1";
}; };
patches = [ patches = [
@ -104,24 +100,15 @@ stdenv.mkDerivation rec {
# But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator.
./validate-icon-pixbuf.patch ./validate-icon-pixbuf.patch
# Fix `flatpak/test-oci-registry@{user,system}.wrap.test` installed tests.
# https://github.com/flatpak/flatpak/pull/3762
(fetchpatch {
url = "https://github.com/flatpak/flatpak/commit/c1447dadecd50f384b6d11dac18b014245267d00.patch";
sha256 = "UAA/wGr8/aMbx5MV+8Ilro2kgKkx2QOn88lDUjCgeDA=";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
autoconf autoreconfHook
automake
libtool
libxml2 libxml2
# TODO: replace with docbook_xml_dtd_45 https://github.com/flatpak/flatpak/pull/3760 # Remove 4.1.2 again once the following is merged
# https://github.com/flatpak/flatpak/pull/4102
docbook_xml_dtd_412 docbook_xml_dtd_412
docbook_xml_dtd_42 docbook_xml_dtd_45
docbook_xml_dtd_43
docbook-xsl-nons docbook-xsl-nons
which which
gobject-introspection gobject-introspection
@ -132,7 +119,7 @@ stdenv.mkDerivation rec {
xmlto xmlto
appstream-glib appstream-glib
yacc yacc
wrapGAppsHook wrapGAppsNoGuiHook
]; ];
buildInputs = [ buildInputs = [
@ -147,7 +134,7 @@ stdenv.mkDerivation rec {
libseccomp libseccomp
libsoup libsoup
lzma lzma
# zstd # TODO: broken paths in .pc file zstd
polkit polkit
python3 python3
systemd systemd
@ -199,16 +186,6 @@ stdenv.mkDerivation rec {
PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler
''; '';
preConfigure = ''
# TODO: remove the condition once autogen.sh is shipped in the tarball
# https://github.com/flatpak/flatpak/pull/3761
if [[ -f autogen.sh ]]; then
NOCONFIGURE=1 ./autogen.sh
else
autoreconf --install --force --verbose
fi
'';
passthru = { passthru = {
tests = { tests = {
installedTests = nixosTests.installed-tests.flatpak; installedTests = nixosTests.installed-tests.flatpak;
@ -218,7 +195,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Linux application sandboxing and distribution framework"; description = "Linux application sandboxing and distribution framework";
homepage = "https://flatpak.org/"; homepage = "https://flatpak.org/";
license = licenses.lgpl21; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ]; maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux; platforms = platforms.linux;
}; };