diff options
| author | John Ericson <git@JohnEricson.me> | 2019-04-01 00:24:46 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-04-01 00:40:03 -0400 |
| commit | 4ccb74011fc77cb761a3c33ed796724795425420 (patch) | |
| tree | 91e0d95cdfe1023c3de5ff214eba58985e2d2d35 /pkgs/tools/package-management | |
| parent | 75514175920e1613c8eaf8026b367b48f8b77027 (diff) | |
| parent | 18aa59b0f26fc707e7313f8467e67159e61600c2 (diff) | |
Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/appimagekit/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index b9454e64ccf7..21e869b7b01e 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub -, pkgconfig, cmake, autoconf, automake, libtool -, wget, xxd, desktop-file-utils -, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive +, pkgconfig, cmake, autoconf, automake, libtool, makeWrapper +, wget, xxd, desktop-file-utils, file +, gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive , squashfsTools , gtest }: @@ -72,9 +72,13 @@ in stdenv.mkDerivation rec { buildInputs = [ glib zlib cairo openssl fuse xz inotify-tools libarchive - squashfsTools + squashfsTools makeWrapper ]; + postPatch = '' + substituteInPlace src/appimagetool.c --replace "/usr/bin/file" "${file}/bin/file" + ''; + preConfigure = '' export HOME=$(pwd) ''; @@ -89,6 +93,14 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_MKSQUASHFS=ON" ]; + postInstall = '' + cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/" + cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" + + wrapProgram "$out/bin/appimagetool" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}" + ''; + checkInputs = [ gtest ]; doCheck = false; # fails 1 out of 4 tests, I'm too lazy to debug why |