alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request from dtzWill/update/awesome-4.3

Browse source 
awesome: 4.2 -> 4.3, don't clutter PATH, touchup lua paths
This commit is contained in:
Alexey Shmalko 2019-01-30 01:03:48 +02:00 committed by GitHub
parent 423e26a1c5 17d3eb2c9a
commit c19693b7d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions

14
pkgs/applications/window-managers/awesome/default.nix
View file

@ -1,21 +1,21 @@
{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf { stdenv, 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, gobject-introspection, unclutter , xcb-util-cursor, makeWrapper, pango, gobject-introspection
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
, which, dbus, nettools, git, asciidoc, doxygen , which, dbus, nettools, git, asciidoc, doxygen
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
, libxkbcommon, xcbutilxrm, hicolor-icon-theme , libxkbcommon, xcbutilxrm, hicolor-icon-theme
, asciidoctor
}: }:
with luaPackages; stdenv.mkDerivation rec { with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}"; name = "awesome-${version}";
version = "4.2"; version = "4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awesomewm"; owner = "awesomewm";
repo = "awesome"; repo = "awesome";
rev = "v${version}"; rev = "v${version}";
sha256 = "1pcgagcvm6rdky8p8dd810j3ywaz0ncyk5xgaykslaixzrq60kff"; sha256 = "1i7ajmgbsax4lzpgnmkyv35x8vxqi0j84a14k6zys4blx94m9yjf";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,6 +27,7 @@ with luaPackages; stdenv.mkDerivation rec {
pkgconfig pkgconfig
xmlto docbook_xml_dtd_45 xmlto docbook_xml_dtd_45
docbook_xsl findXMLCatalogs docbook_xsl findXMLCatalogs
asciidoctor
]; ];
propagatedUserEnvPkgs = [ hicolor-icon-theme ]; propagatedUserEnvPkgs = [ hicolor-icon-theme ];
@ -43,7 +44,7 @@ with luaPackages; stdenv.mkDerivation rec {
GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; LUA_PATH = "?.lua;${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
postInstall = '' postInstall = ''
wrapProgram $out/bin/awesome \ wrapProgram $out/bin/awesome \
@ -51,7 +52,8 @@ with luaPackages; stdenv.mkDerivation rec {
--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}' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" --prefix LUA_PATH ';' "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \
--prefix LUA_CPATH ';' "${lgi}/lib/lua/${lua.luaversion}/?.so"
wrapProgram $out/bin/awesome-client \ wrapProgram $out/bin/awesome-client \
--prefix PATH : "${which}/bin" --prefix PATH : "${which}/bin"