Commit graph

4 commits

Author SHA1 Message Date
John Ericson 4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
2019-04-01 00:40:03 -04:00
Pedro Pombeiro 7b1d4844d9 appimagekit: add some fixes (#57591)
* appimagekit: fix usage of `file` so it works on NixOS

* appimagekit: copy missing mksquashfs and desktop-file-utils
2019-03-23 10:59:10 -04:00
Matthew Bauer 6ed49262f5 treewide: remove BUILD_TESTING flag
This is now set by CMake
2019-03-11 10:11:28 -04:00
Jan Malakhovski 1e3c993286 appimagekit: init at 20180727 2018-08-05 19:49:52 +00:00