commit 614162ee6c4ea7dfa14c6fb0c35b0ce3058bda53 · pyrox.dev/nixpkgs

+26 -5

nixos/modules/services/x11/window-managers/awesome.nix

···

       5
       5
        
       let

     

       6
       6
        
       

     

       7
       7
        
         cfg = config.services.xserver.windowManager.awesome;

     

       8
       8
       +
         awesome = cfg.package;

     

       8
       9
        
       

     

       9
       10
        
       in

     

       10
       11
        
       

     
···

       14
       15
        
       

     

       15
       16
        
         options = {

     

       16
       17
        
       

     

       17
       17
       -
           services.xserver.windowManager.awesome.enable = mkOption {

     

       18
       18
       -
             default = false;

     

       19
       19
       -
             description = "Enable the Awesome window manager.";

     

       18
       18
       +
           services.xserver.windowManager.awesome = {

     

       19
       19
       +
       

     

       20
       20
       +
             enable = mkEnableOption "Awesome window manager";

     

       21
       21
       +
       

     

       22
       22
       +
             luaModules = mkOption {

     

       23
       23
       +
               default = [];

     

       24
       24
       +
               type = types.listOf types.package;

     

       25
       25
       +
               description = "List of lua packages available for being used in the Awesome configuration.";

     

       26
       26
       +
               example = literalExample "[ luaPackages.oocairo ]";

     

       27
       27
       +
             };

     

       28
       28
       +
       

     

       29
       29
       +
             package = mkOption {

     

       30
       30
       +
               default = null;

     

       31
       31
       +
               type = types.nullOr types.package;

     

       32
       32
       +
               description = "Package to use for running the Awesome WM.";

     

       33
       33
       +
               apply = pkg: if pkg == null then pkgs.awesome else pkg;

     

       34
       34
       +
             };

     

       35
       35
       +
       

     

       20
       36
        
           };

     

       21
       37
        
       

     

       22
       38
        
         };

     
···

       30
       46
        
             { name = "awesome";

     

       31
       47
        
               start =

     

       32
       48
        
                 ''

     

       33
       33
       -
                   ${pkgs.awesome}/bin/awesome &

     

       49
       49
       +
                   ${concatMapStrings (pkg: ''

     

       50
       50
       +
                     export LUA_CPATH=$LUA_CPATH''${LUA_CPATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.so

     

       51
       51
       +
                     export LUA_PATH=$LUA_PATH''${LUA_PATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.lua

     

       52
       52
       +
                   '') cfg.luaModules}

     

       53
       53
       +
       

     

       54
       54
       +
                   ${awesome}/bin/awesome &

     

       34
       55
        
                   waitPID=$!

     

       35
       56
        
                 '';

     

       36
       57
        
             };

     

       37
       58
        
       

     

       38
       38
       -
           environment.systemPackages = [ pkgs.awesome ];

     

       59
       59
       +
           environment.systemPackages = [ awesome ];

     

       39
       60
        
       

     

       40
       61
        
         };

     

       41
       62

+5

pkgs/applications/window-managers/awesome/3.4.nix

···

       47
       47
        
           maintainers = with stdenv.lib.maintainers; [viric];

     

       48
       48
        
           platforms = with stdenv.lib.platforms; linux;

     

       49
       49
        
         };

     

       50
       50
       +
       

     

       51
       51
       +
         passthru = {

     

       52
       52
       +
           inherit lua;

     

       53
       53
       +
         };

     

       54
       54
       +
       

     

       50
       55
        
       }

+13 -8

pkgs/applications/window-managers/awesome/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, lua, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf

     

       1
       1
       +
       { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf

     

       2
       2
        
       , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs

     

       3
       3
       -
       , xcb-util-cursor, lgi, makeWrapper, pango, gobjectIntrospection, unclutter

     

       3
       3
       +
       , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter

     

       4
       4
        
       , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode

     

       5
       5
        
       , which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45

     

       6
       6
        
       , docbook_xsl }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
        
         version = "3.5.5";

     

       10
       10
       -
       in

     

       10
       10
       +
       in with luaPackages;

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         name = "awesome-${version}";

     
···

       32
       32
        
           dbus

     

       33
       33
        
           doxygen

     

       34
       34
        
           gdk_pixbuf

     

       35
       35
       +
           gobjectIntrospection

     

       35
       36
        
           git

     

       36
       37
        
           imagemagick

     

       37
       38
        
           lgi

     
···

       60
       61
        
       

     

       61
       62
        
         LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib";

     

       62
       63
        
         GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0";

     

       63
       63
       -
         LUA_CPATH = "${lgi}/lib/lua/5.1/?.so";

     

       64
       64
       -
         LUA_PATH  = "${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua";

     

       64
       64
       +
         LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";

     

       65
       65
       +
         LUA_PATH  = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";

     

       65
       66
        
       

     

       66
       67
        
         postInstall = ''

     

       67
       68
        
           wrapProgram $out/bin/awesome \

     

       68
       68
       -
             --set LUA_CPATH '"${lgi}/lib/lua/5.1/?.so"' \

     

       69
       69
       -
             --set LUA_PATH '"${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"' \

     

       70
       70
       -
             --set GI_TYPELIB_PATH "${pango}/lib/girepository-1.0" \

     

       69
       69
       +
             --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \

     

       70
       70
       +
             --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \

     

       71
       71
       +
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       71
       72
        
             --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \

     

       72
       73
        
             --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin"

     

       73
       74
        
       

     

       74
       75
        
           wrapProgram $out/bin/awesome-client \

     

       75
       76
        
             --prefix PATH : "${which}/bin"

     

       76
       77
        
         '';

     

       78
       78
       +
       

     

       79
       79
       +
         passthru = {

     

       80
       80
       +
           inherit lua;

     

       81
       81
       +
         };

     

       77
       82
        
       }

-24

pkgs/development/libraries/lgi/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, gobjectIntrospection, lua, glib }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "lgi-0.7.2";

     

       5
       5
       -
       

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url    = https://github.com/pavouk/lgi/archive/0.7.2.tar.gz;

     

       8
       8
       -
           sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn";

     

       9
       9
       -
         };

     

       10
       10
       -
       

     

       11
       11
       -
         meta = with stdenv.lib; {

     

       12
       12
       -
           description = "Gobject-introspection based dynamic Lua binding to GObject based libraries";

     

       13
       13
       -
           homepage    = https://github.com/pavouk/lgi;

     

       14
       14
       -
           license     = "custom";

     

       15
       15
       -
           maintainers = with maintainers; [ lovek323 ];

     

       16
       16
       -
           platforms   = platforms.unix;

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         buildInputs = [ glib gobjectIntrospection lua pkgconfig ];

     

       20
       20
       -
       

     

       21
       21
       -
         preBuild = ''

     

       22
       22
       -
           sed -i "s|/usr/local|$out|" lgi/Makefile

     

       23
       23
       -
         '';

     

       24
       24
       -
       }

-2

pkgs/top-level/all-packages.nix

···

       5640
       5640
        
           libpng = libpng12;

     

       5641
       5641
        
         };

     

       5642
       5642
        
       

     

       5643
       5643
       -
         lgi = callPackage ../development/libraries/lgi { };

     

       5644
       5644
       -
       

     

       5645
       5643
        
         lib3ds = callPackage ../development/libraries/lib3ds { };

     

       5646
       5644
        
       

     

       5647
       5645
        
         libaacs = callPackage ../development/libraries/libaacs { };

+31 -2

pkgs/top-level/lua-packages.nix

···

       5
       5
        
          for each package in a separate file: the call to the function would

     

       6
       6
        
          be almost as must code as the function itself. */

     

       7
       7
        
       

     

       8
       8
       -
       { fetchurl, stdenv, lua, callPackage, unzip, zziplib

     

       9
       9
       -
       , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat

     

       8
       8
       +
       { fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool

     

       9
       9
       +
       , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo

     

       10
       10
       +
       , perl, gtk, python, glib, gobjectIntrospection

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       let

     
···

       14
       15
        
         isLua52 = lua.luaversion == "5.2";

     

       15
       16
        
         self = _self;

     

       16
       17
        
         _self = with self; {

     

       18
       18
       +
         inherit lua;

     

       17
       19
        
         inherit (stdenv.lib) maintainers;

     

       18
       20
        
       

     

       19
       21
        
         #define build lua package function

     
···

       255
       257
        
             license = stdenv.lib.licenses.mit;

     

       256
       258
        
           };

     

       257
       259
        
         };

     

       260
       260
       +
       

     

       261
       261
       +
         lgi = stdenv.mkDerivation rec {

     

       262
       262
       +
           name = "lgi-${version}";

     

       263
       263
       +
           version = "0.7.2";

     

       264
       264
       +
       

     

       265
       265
       +
           src = fetchurl {

     

       266
       266
       +
             url    = "https://github.com/pavouk/lgi/archive/${version}.tar.gz";

     

       267
       267
       +
             sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn";

     

       268
       268
       +
           };

     

       269
       269
       +
       

     

       270
       270
       +
           meta = with stdenv.lib; {

     

       271
       271
       +
             description = "GObject-introspection based dynamic Lua binding to GObject based libraries";

     

       272
       272
       +
             homepage    = https://github.com/pavouk/lgi;

     

       273
       273
       +
             license     = "custom";

     

       274
       274
       +
             maintainers = with maintainers; [ lovek323 ];

     

       275
       275
       +
             platforms   = platforms.unix;

     

       276
       276
       +
           };

     

       277
       277
       +
       

     

       278
       278
       +
           buildInputs = [ glib gobjectIntrospection lua pkgconfig ];

     

       279
       279
       +
       

     

       280
       280
       +
           makeFlags = [ "LUA_VERSION=${lua.luaversion}" ];

     

       281
       281
       +
       

     

       282
       282
       +
           preBuild = ''

     

       283
       283
       +
             sed -i "s|/usr/local|$out|" lgi/Makefile

     

       284
       284
       +
           '';

     

       285
       285
       +
         };

     

       286
       286
       +
       

     

       258
       287
        
       }; in self