diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/development/libraries/flatpak | |
parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/flatpak')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/flatpak/default.nix | 33 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch | 38 |
2 files changed, 43 insertions, 28 deletions
diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 41ab930a30ed..ebf55dcd194c 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -1,26 +1,24 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit -, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }: +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }: -let - version = "1.0.5"; - desktop_schemas = gnome3.gsettings-desktop-schemas; -in stdenv.mkDerivation rec { - name = "flatpak-${version}"; +stdenv.mkDerivation rec { + pname = "flatpak"; + version = "1.1.3"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { - url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1wj88lp23bzz0c5n1i84nr2xff572i5cc10fqd9xh7qhj3ivk1w0"; + url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "12xqhszx50pmw2nx7n1pym7n47z95ddwwkyx35bfgmxsd9hjpmh2"; }; patches = [ (substituteAll { src = ./fix-test-paths.patch; - inherit coreutils glibcLocales; + inherit coreutils gettext glibcLocales; hicolorIconTheme = hicolor-icon-theme; }) (substituteAll { @@ -34,18 +32,23 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobject-introspection - gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper + gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc wrapGAppsHook ]; buildInputs = [ - bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp + bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp libsoup lzma ostree polkit python3 systemd xorg.libXau + gnome3.gsettings-desktop-schemas glib-networking ]; checkInputs = [ valgrind ]; doCheck = false; # TODO: some issues with temporary files + NIX_LDFLAGS = [ + "-lpthread" + ]; + enableParallelBuilding = true; configureFlags = [ @@ -65,12 +68,6 @@ in stdenv.mkDerivation rec { patchShebangs tests ''; - postFixup = '' - wrapProgram $out/bin/flatpak \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}" - ''; - meta = with stdenv.lib; { description = "Linux application sandboxing and distribution framework"; homepage = https://flatpak.org/; diff --git a/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch b/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch index d00e4fa7f895..f987899e3bcb 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,14 +1,14 @@ --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -296,7 +296,7 @@ - # running installed-tests: assume we know what we're doing - : - elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ -- --ro-bind / / /bin/true > bwrap-result 2>&1; then -+ --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then - sed -e 's/^/# /' < bwrap-result - echo "1..0 # SKIP Cannot run bwrap" - exit 0 +@@ -328,7 +328,7 @@ + # running installed-tests: assume we know what we're doing + _flatpak_bwrap_works=true + elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ +- --ro-bind / / /bin/true > bwrap-result 2>&1; then ++ --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then + _flatpak_bwrap_works=false + else + _flatpak_bwrap_works=true @@ -309,12 +309,12 @@ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -24,6 +24,24 @@ gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : if test -n "${TEST_SKIP_CLEANUP:-}"; then +--- a/tests/make-test-app.sh ++++ b/tests/make-test-app.sh +@@ -114,13 +114,13 @@ msgid "Hello world" + msgstr "Hallo Welt" + EOF + mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES +-msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po ++@gettext@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po + cat > fr.po <<EOF + msgid "Hello world" + msgstr "Bonjour le monde" + EOF + mkdir -p ${DIR}/files/fr/share/fr/LC_MESSAGES +-msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po ++@gettext@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po + + flatpak build-finish ${DIR} + mkdir -p repos --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh @@ -26,6 +26,7 @@ @@ -61,7 +79,7 @@ - fi -} - - for i in $@; do + for i in $@ bash ls cat echo readlink; do - I=`which $i` - add_bin $I -done |