public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25787 from samueldr/fix/awesome-read-svg

Browse Source 
awesome: Allows awesome to load svg images.
This commit is contained in:
Jörg Thalheim 2017-05-14 22:55:14 +01:00 committed by GitHub
commit 682ee957a7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/window-managers/awesome/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf { stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
@ -30,7 +30,7 @@ with luaPackages; stdenv.mkDerivation rec {
]; ];
propagatedUserEnvPkgs = [ hicolor_icon_theme ]; propagatedUserEnvPkgs = [ hicolor_icon_theme ];
buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection
git lgi libpthreadstubs libstartup_notification git lgi libpthreadstubs libstartup_notification
libxdg_basedir lua nettools pango xcb-util-cursor libxdg_basedir lua nettools pango xcb-util-cursor
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
@ -54,6 +54,7 @@ with luaPackages; stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/awesome \ wrapProgram $out/bin/awesome \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
--prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \