From 674a5e95d7a3a291d40b4428d95835b7a6516419 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 26 Feb 2019 19:37:41 +0100 Subject: [PATCH 1/2] llpp: remove unused lib directory --- pkgs/applications/misc/llpp/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index ed3aca996e15..1a36eeeb8b6f 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -34,10 +34,9 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -d $out/bin $out/lib + install -d $out/bin install build/llpp $out/bin wrapProgram $out/bin/llpp \ - --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ --prefix PATH ":" "${xclip}/bin" ''; From c199c586218b453239e126d426b1c0cbfb6d1686 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 26 Feb 2019 19:38:01 +0100 Subject: [PATCH 2/2] llpp: install llpp.inotify into bin/ --- pkgs/applications/misc/llpp/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 1a36eeeb8b6f..5ae652d750d1 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -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"; @@ -36,8 +36,15 @@ stdenv.mkDerivation rec { installPhase = '' install -d $out/bin install build/llpp $out/bin + install misc/llpp.inotify $out/bin/llpp.inotify + wrapProgram $out/bin/llpp \ --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; {