Merge pull request #117031 from chvp/fix-mu-scripts
mu: Fix included scripts not finding their dependencies
This commit is contained in:
commit
447fb4c904
1 changed files with 9 additions and 4 deletions
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe
|
||||
, xapian, glib, gmime3, texinfo , emacs, guile
|
||||
, xapian, glib, gmime3, texinfo, emacs, guile
|
||||
, gtk3, webkitgtk, libsoup, icu
|
||||
, makeWrapper
|
||||
, withMug ? false
|
||||
, batchSize ? null }:
|
||||
|
||||
|
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (!stdenv.isDarwin) guile
|
||||
++ lib.optionals withMug [ gtk3 webkitgtk ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook pmccabe ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -37,8 +38,12 @@ stdenv.mkDerivation rec {
|
|||
--replace "@abs_top_builddir@" "$out"
|
||||
'';
|
||||
|
||||
# Install mug
|
||||
postInstall = lib.optionalString withMug ''
|
||||
# Make sure included scripts can find their dependencies & optionally install mug
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/mu" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/lib" \
|
||||
--prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2"
|
||||
'' + lib.optionalString withMug ''
|
||||
for f in mug ; do
|
||||
install -m755 toys/$f/$f $out/bin/$f
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue