Merge pull request #80384 from worldofpeace/flatpak-ostree

flatpak: propagate glib and ostree
NixOS · Feb 18, 2020 · 6f0cb03 · 6f0cb03
2 parents 8fa73be + 26f1d1e
commit 6f0cb03
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
@@ -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,15 +128,13 @@ stdenv.mkDerivation rec {
     bzip2
     dbus
     dconf
-    glib
     gpgme
     json-glib
     libarchive
     libcap
     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
   ];