public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80384 from worldofpeace/flatpak-ostree 

flatpak: propagate glib and ostree
This commit is contained in:
worldofpeace 2020-02-17 19:39:02 -05:00 committed by GitHub
parent 8fa73be07b 26f1d1e81b
commit 6f0cb035c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/flatpak/default.nix
View File

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
version = "1.6.2"; version = "1.6.2";
# TODO: split out lib once we figure out what to do with triggerdir # 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 { src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
@ -128,7 +128,6 @@ stdenv.mkDerivation rec {
bzip2 bzip2
dbus dbus
dconf dconf
glib
gpgme gpgme
json-glib json-glib
libarchive libarchive
@ -136,7 +135,6 @@ stdenv.mkDerivation rec {
libseccomp libseccomp
libsoup libsoup
lzma lzma
ostree
polkit polkit
python3 python3
systemd systemd
@ -148,6 +146,12 @@ stdenv.mkDerivation rec {
librsvg # for flatpak-validate-icon librsvg # for flatpak-validate-icon
]; ];
# Required by flatpak.pc
propagatedBuildInputs = [
glib
ostree
];
checkInputs = [ checkInputs = [
valgrind valgrind
]; ];