Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Install llpp.inotify #56422

Merged
merged 2 commits into from Feb 28, 2019
Merged

Install llpp.inotify #56422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
674a5e9
llpp: remove unused lib directory
pSub Feb 26, 2019
c199c58
llpp: install llpp.inotify into bin/
pSub Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions pkgs/applications/misc/llpp/default.nix
View file
Open in desktop
@@ -1,5 +1,5 @@
{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11,
libGLU_combined, freetype, xclip }:
libGLU_combined, freetype, xclip, inotify-tools, procps }:

assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";

Expand Down Expand Up @@ -34,11 +34,17 @@ stdenv.mkDerivation rec {
'';

installPhase = ''
install -d $out/bin $out/lib
install -d $out/bin
install build/llpp $out/bin
install misc/llpp.inotify $out/bin/llpp.inotify

wrapProgram $out/bin/llpp \
--prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \
--prefix PATH ":" "${xclip}/bin"

wrapProgram $out/bin/llpp.inotify \
--prefix PATH ":" "$out/bin" \
--prefix PATH ":" "${inotify-tools}/bin" \
--prefix PATH ":" "${procps}/bin"
'';

meta = with stdenv.lib; {
Expand Down