mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-19 19:52:28 +03:00
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,6 +1,7 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe
|
{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe
|
||||||
, xapian, glib, gmime3, texinfo, emacs, guile
|
, xapian, glib, gmime3, texinfo, emacs, guile
|
||||||
, gtk3, webkitgtk, libsoup, icu
|
, gtk3, webkitgtk, libsoup, icu
|
||||||
|
, makeWrapper
|
||||||
, withMug ? false
|
, withMug ? false
|
||||||
, batchSize ? null }:
|
, batchSize ? null }:
|
||||||
|
|
||||||
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||||||
++ lib.optional (!stdenv.isDarwin) guile
|
++ lib.optional (!stdenv.isDarwin) guile
|
||||||
++ lib.optionals withMug [ gtk3 webkitgtk ];
|
++ lib.optionals withMug [ gtk3 webkitgtk ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config autoreconfHook pmccabe ];
|
nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
@ -37,8 +38,12 @@ stdenv.mkDerivation rec {
|
|||||||
--replace "@abs_top_builddir@" "$out"
|
--replace "@abs_top_builddir@" "$out"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Install mug
|
# Make sure included scripts can find their dependencies & optionally install mug
|
||||||
postInstall = lib.optionalString withMug ''
|
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
|
for f in mug ; do
|
||||||
install -m755 toys/$f/$f $out/bin/$f
|
install -m755 toys/$f/$f $out/bin/$f
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user