git.iko.soy/typeable/nixpkgs
on master help sign in
awesome: 3.5.9 -> 4.0
commitb33907075f1b8f8b9abc8e7c8bbb3fd20ff81d62 authorAlexey Shmalko <rasen.dubi@gmail.com> dateMon 26 Dec 2016, 21:33 (10 years ago) parentaf0b2d5
4 files changed+98−64
pkgs/applications/window-managers/awesome/3.4.nix−55 pkgs/applications/window-managers/awesome/3.5.nix+86 pkgs/applications/window-managers/awesome/default.nix+8−5 pkgs/top-level/all-packages.nix+4−4
pkgs/applications/window-managers/awesome/3.4.nixdeleted−55
@@ -1,55 +0,0 @@
1−{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua
2−, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
3−, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
4−, libXdmcp, pixman, doxygen
5−, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
6−, docbook_xml_dtd_45, libxslt, coreutils, which }:
7−
8−let
9− version = "3.4.13";
10−in
11−
12−stdenv.mkDerivation rec {
13− name = "awesome-${version}";
14−
15− src = fetchurl {
16− url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
17− sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr";
18− };
19−
20− buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango
21− imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
22− libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
23− asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ];
24−
25− # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
26− # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as
27− # dependencies.
28− prePatch = ''
29− # Fix the tab completion (supporting bash or zsh)
30− sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
31− # Remove the 'root' PATH override (I don't know why they have that)
32− sed /WHOAMI/d -i utils/awsetbg
33− # Russian manpages fail to be generated:
34− # [ 56%] Generating manpages/ru/man1/awesome.1.xml
35− # asciidoc: ERROR: <stdin>: line 3: name section expected
36− # asciidoc: FAILED: <stdin>: line 3: section title expected
37− # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
38− substituteInPlace CMakeLists.txt \
39− --replace "set(AWE_MAN_LANGS it es fr de ru)" \
40− "set(AWE_MAN_LANGS it es fr de)"
41− '';
42−
43− meta = {
44− homepage = http://awesome.naquadah.org/;
45− description = "Highly configurable, dynamic window manager for X";
46− license = stdenv.lib.licenses.gpl2Plus;
47− maintainers = with stdenv.lib.maintainers; [viric];
48− platforms = with stdenv.lib.platforms; linux;
49− };
50−
51− passthru = {
52− inherit lua;
53− };
54−
55−}
pkgs/applications/window-managers/awesome/3.5.nixnew file+86
@@ -0,0 +1,86 @@
1+{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
2+, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
3+, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
4+, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
5+, which, dbus, nettools, git, asciidoc, doxygen
6+, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
7+}:
8+
9+let
10+ version = "3.5.9";
11+in with luaPackages;
12+
13+stdenv.mkDerivation rec {
14+ name = "awesome-${version}";
15+
16+ src = fetchurl {
17+ url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
18+ sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67";
19+ };
20+
21+ meta = with stdenv.lib; {
22+ description = "Highly configurable, dynamic window manager for X";
23+ homepage = http://awesome.naquadah.org/;
24+ license = licenses.gpl2Plus;
25+ maintainers = with maintainers; [ lovek323 ];
26+ platforms = platforms.linux;
27+ };
28+
29+ nativeBuildInputs = [
30+ asciidoc
31+ cmake
32+ doxygen
33+ imagemagick
34+ makeWrapper
35+ pkgconfig
36+ xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
37+ ];
38+
39+ buildInputs = [
40+ cairo
41+ dbus
42+ gdk_pixbuf
43+ gobjectIntrospection
44+ git
45+ lgi
46+ libpthreadstubs
47+ libstartup_notification
48+ libxdg_basedir
49+ lua
50+ nettools
51+ pango
52+ xcb-util-cursor
53+ xorg.libXau
54+ xorg.libXdmcp
55+ xorg.libxcb
56+ xorg.libxshmfence
57+ xorg.xcbutil
58+ xorg.xcbutilimage
59+ xorg.xcbutilkeysyms
60+ xorg.xcbutilrenderutil
61+ xorg.xcbutilwm
62+ ];
63+
64+ #cmakeFlags = "-DGENERATE_MANPAGES=ON";
65+
66+ LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
67+ GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
68+ LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
69+ LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
70+
71+ postInstall = ''
72+ wrapProgram $out/bin/awesome \
73+ --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
74+ --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
75+ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
76+ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
77+ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
78+
79+ wrapProgram $out/bin/awesome-client \
80+ --prefix PATH : "${which}/bin"
81+ '';
82+
83+ passthru = {
84+ inherit lua;
85+ };
86+}
pkgs/applications/window-managers/awesome/default.nix+8−5
@@ -4,25 +4,26 @@
44, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
55, which, dbus, nettools, git, asciidoc, doxygen
66, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
7+, libxkbcommon, xcbutilxrm
78}:
89
910let
10− version = "3.5.9";
11+ version = "4.0";
1112in with luaPackages;
1213
1314stdenv.mkDerivation rec {
1415 name = "awesome-${version}";
1516
1617 src = fetchurl {
17− url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
18− sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67";
18+ url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz";
19+ sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w";
1920 };
2021
2122 meta = with stdenv.lib; {
2223 description = "Highly configurable, dynamic window manager for X";
23− homepage = http://awesome.naquadah.org/;
24+ homepage = https://awesomewm.org/;
2425 license = licenses.gpl2Plus;
25− maintainers = with maintainers; [ lovek323 ];
26+ maintainers = with maintainers; [ lovek323 rasendubi ];
2627 platforms = platforms.linux;
2728 };
2829
@@ -59,6 +60,8 @@ stdenv.mkDerivation rec {
5960 xorg.xcbutilkeysyms
6061 xorg.xcbutilrenderutil
6162 xorg.xcbutilwm
63+ libxkbcommon
64+ xcbutilxrm
6265 ];
6366
6467 #cmakeFlags = "-DGENERATE_MANPAGES=ON";
pkgs/top-level/all-packages.nix+4−4
@@ -12328,15 +12328,15 @@ in
1232812328 ffmpeg = ffmpeg_2;
1232912329 };
1233012330
12331− awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix {
12331+ awesome-3-5 = callPackage ../applications/window-managers/awesome/3.5.nix {
1233212332 cairo = cairo.override { xcbSupport = true; };
12333− lua = lua5_1;
12333+ luaPackages = luaPackages.override { inherit lua; };
1233412334 };
12335− awesome-3-5 = callPackage ../applications/window-managers/awesome {
12335+ awesome-4-0 = callPackage ../applications/window-managers/awesome {
1233612336 cairo = cairo.override { xcbSupport = true; };
1233712337 luaPackages = luaPackages.override { inherit lua; };
1233812338 };
12339− awesome = awesome-3-5;
12339+ awesome = awesome-4-0;
1234012340
1234112341 awesomebump = qt5.callPackage ../applications/graphics/awesomebump { };
1234212342