Skip to content

Commit

Permalink
flatpak: propagate glib and ostree
Browse files Browse the repository at this point in the history
Pantheon's sideload broke:
```
meson.build:17:0: ERROR: Could not generate cargs for flatpak:
Package ostree-1 was not found in the pkg-config search path.
Perhaps you should add the directory containing `ostree-1.pc'
to the PKG_CONFIG_PATH environment variable
Package 'ostree-1', required by 'flatpak', not found
```

https://hydra.nixos.org/build/113077888

ZHF: NixOS#80379
(cherry picked from commit 461ea02)
  • Loading branch information
worldofpeace authored and dtzWill committed Feb 18, 2020
1 parent 9dc19ff commit 486598b
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pkgs/development/libraries/flatpak/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,13 @@ stdenv.mkDerivation rec {
bzip2
dbus
dconf
glib
gpgme
json-glib
libarchive
libcap
libseccomp
libsoup
lzma
ostree
polkit
python3
systemd
Expand All @@ -158,6 +156,12 @@ stdenv.mkDerivation rec {
fuse
];

# Required by flatpak.pc
propagatedBuildInputs = [
glib
ostree
];

checkInputs = [
valgrind
];
Expand Down

0 comments on commit 486598b

Please sign in to comment.