diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-17 19:39:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 19:39:02 -0500 |
| commit | 6f0cb035c2436378953f3fe0256b02a462de5699 (patch) | |
| tree | 1fe2ab2c8f0c03d9cea15489bbaf3674d6f60a9e /pkgs/development/libraries/flatpak | |
| parent | 8fa73be07be72a86f84f9d6688a33603027f20d2 (diff) | |
| parent | 26f1d1e81b22803a54377f9ac9ceb767f02e2770 (diff) | |
| download | nixpkgs-6f0cb035c2436378953f3fe0256b02a462de5699.tar nixpkgs-6f0cb035c2436378953f3fe0256b02a462de5699.tar.gz nixpkgs-6f0cb035c2436378953f3fe0256b02a462de5699.tar.bz2 nixpkgs-6f0cb035c2436378953f3fe0256b02a462de5699.tar.lz nixpkgs-6f0cb035c2436378953f3fe0256b02a462de5699.tar.xz nixpkgs-6f0cb035c2436378953f3fe0256b02a462de5699.tar.zst nixpkgs-6f0cb035c2436378953f3fe0256b02a462de5699.zip | |
Merge pull request #80384 from worldofpeace/flatpak-ostree
flatpak: propagate glib and ostree
Diffstat (limited to 'pkgs/development/libraries/flatpak')
| -rw-r--r-- | pkgs/development/libraries/flatpak/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index a73efffc7ed..d0d548bb896 100644 --- 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,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 ]; |