Merge pull request #80384 from worldofpeace/flatpak-ostree
flatpak: propagate glib and ostree
This commit is contained in:
commit
6f0cb035c2
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.6.2";
|
||||
|
||||
# TODO: split out lib once we figure out what to do with triggerdir
|
||||
outputs = [ "out" "man" "doc" "installedTests" ];
|
||||
outputs = [ "out" "dev" "man" "doc" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
@ -128,7 +128,6 @@ stdenv.mkDerivation rec {
|
||||
bzip2
|
||||
dbus
|
||||
dconf
|
||||
glib
|
||||
gpgme
|
||||
json-glib
|
||||
libarchive
|
||||
@ -136,7 +135,6 @@ stdenv.mkDerivation rec {
|
||||
libseccomp
|
||||
libsoup
|
||||
lzma
|
||||
ostree
|
||||
polkit
|
||||
python3
|
||||
systemd
|
||||
@ -148,6 +146,12 @@ stdenv.mkDerivation rec {
|
||||
librsvg # for flatpak-validate-icon
|
||||
];
|
||||
|
||||
# Required by flatpak.pc
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
ostree
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
valgrind
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user