3
0
Fork 0
forked from mirrors/nixpkgs

awesome: use makeWrapper rather than wrapProgram (#61060)

awesome: use makeWrapper rather than wrapProgram
This commit is contained in:
Jörg Thalheim 2019-05-07 07:07:36 +01:00 committed by GitHub
commit dd2052ce36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -48,7 +48,10 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;"; LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
postInstall = '' postInstall = ''
wrapProgram $out/bin/awesome \ # Don't use wrapProgram or or the wrapper will duplicate the --search
# arguments every restart
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
--add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \