commit 858f088007629d44341e81437c30cd1ee34ec0d5 · pyrox.dev/nixpkgs

+2 -1

nixos/modules/services/x11/desktop-managers/default.nix

···

       19
       19
        
         # E.g., if KDE is enabled, it supersedes xterm.

     

       20
       20
        
         imports = [

     

       21
       21
        
           ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix

     

       22
       22
       -
           ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix

     

       22
       22
       +
           ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix

     

       23
       23
       +
           ./kodi.nix

     

       23
       24
        
         ];

     

       24
       25
        
       

     

       25
       26
        
         options = {

+52

nixos/modules/services/x11/desktop-managers/lumina.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
       

     

       7
       7
       +
         xcfg = config.services.xserver;

     

       8
       8
       +
         cfg = xcfg.desktopManager.lumina;

     

       9
       9
       +
       

     

       10
       10
       +
       in

     

       11
       11
       +
       

     

       12
       12
       +
       {

     

       13
       13
       +
         options = {

     

       14
       14
       +
       

     

       15
       15
       +
           services.xserver.desktopManager.lumina.enable = mkOption {

     

       16
       16
       +
             type = types.bool;

     

       17
       17
       +
             default = false;

     

       18
       18
       +
             description = "Enable the Lumina desktop manager";

     

       19
       19
       +
           };

     

       20
       20
       +
       

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
       

     

       24
       24
       +
         config = mkIf (xcfg.enable && cfg.enable) {

     

       25
       25
       +
       

     

       26
       26
       +
           services.xserver.desktopManager.session = singleton {

     

       27
       27
       +
             name = "lumina";

     

       28
       28
       +
             start = ''

     

       29
       29
       +
               exec ${pkgs.lumina}/bin/start-lumina-desktop

     

       30
       30
       +
             '';

     

       31
       31
       +
           };

     

       32
       32
       +
       

     

       33
       33
       +
           environment.systemPackages = [

     

       34
       34
       +
             pkgs.fluxbox

     

       35
       35
       +
             pkgs.kde5.kwindowsystem

     

       36
       36
       +
             pkgs.kde5.oxygen-icons5

     

       37
       37
       +
             pkgs.lumina

     

       38
       38
       +
             pkgs.numlockx

     

       39
       39
       +
             pkgs.qt5.qtsvg

     

       40
       40
       +
             pkgs.xscreensaver

     

       41
       41
       +
           ];

     

       42
       42
       +
       

     

       43
       43
       +
           # Link some extra directories in /run/current-system/software/share

     

       44
       44
       +
           environment.pathsToLink = [

     

       45
       45
       +
             "/share/desktop-directories"

     

       46
       46
       +
             "/share/icons"

     

       47
       47
       +
             "/share/lumina"

     

       48
       48
       +
             "/share"

     

       49
       49
       +
           ];

     

       50
       50
       +
       

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+26

pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch

···

       1
       1
       +
       diff --git a/src-qt5/core/libLumina/LuminaOS-NixOS.cpp b/src-qt5/core/libLumina/LuminaOS-NixOS.cpp

     

       2
       2
       +
       index b92d1b0..441b1bf 100644

     

       3
       3
       +
       --- a/src-qt5/core/libLumina/LuminaOS-NixOS.cpp

     

       4
       4
       +
       +++ b/src-qt5/core/libLumina/LuminaOS-NixOS.cpp

     

       5
       5
       +
       @@ -13,17 +13,17 @@

     

       6
       6
       +
        //can't read xbrightness settings - assume invalid until set

     

       7
       7
       +
        static int screenbrightness = -1;

     

       8
       8
       +
        

     

       9
       9
       +
       -QString LOS::OSName(){ return "Gentoo Linux"; }

     

       10
       10
       +
       +QString LOS::OSName(){ return "NixOS"; }

     

       11
       11
       +
        

     

       12
       12
       +
        //OS-specific prefix(s)

     

       13
       13
       +
        // NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in

     

       14
       14
       +
        QString LOS::LuminaShare(){ return (L_SHAREDIR+"/lumina-desktop/"); } //Install dir for Lumina share files

     

       15
       15
       +
       -QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications

     

       16
       16
       +
       -QString LOS::SysPrefix(){ return "/"; } //Prefix for system

     

       17
       17
       +
       +QString LOS::AppPrefix(){ return PREFIX+"/usr"; } //Prefix for applications

     

       18
       18
       +
       +QString LOS::SysPrefix(){ return PREFIX; } //Prefix for system

     

       19
       19
       +
        

     

       20
       20
       +
        //OS-specific application shortcuts (*.desktop files)

     

       21
       21
       +
        QString LOS::ControlPanelShortcut(){ return ""; } //system control panel

     

       22
       22
       +
       -QString LOS::AppStoreShortcut(){ return LOS::AppPrefix() + "/share/applications/porthole.desktop"; } //graphical app/pkg manager

     

       23
       23
       +
       +QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager

     

       24
       24
       +
        //OS-specific RSS feeds (Format: QStringList[ <name>::::<url> ]; )

     

       25
       25
       +
        QStringList LOS::RSSFeeds(){ return QStringList(); } 

     

       26
       26
       +

+11

pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch

···

       1
       1
       +
       diff -Naur lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri

     

       2
       2
       +
       --- lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri	2016-08-09 12:04:30.000000000 -0300

     

       3
       3
       +
       +++ lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri	2016-08-13 17:32:18.272137900 -0300

     

       4
       4
       +
       @@ -55,7 +55,6 @@

     

       5
       5
       +
            #Use the defaults for everything else

     

       6
       6
       +
        

     

       7
       7
       +
          }else : linux-*{

     

       8
       8
       +
       -    L_SESSDIR=/usr/share/xsessions

     

       9
       9
       +
            OS=Linux

     

       10
       10
       +
            LIBS += -L/usr/local/lib -L/usr/lib -L/lib

     

       11
       11
       +

+69

pkgs/desktops/lumina/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils,

     

       2
       2
       +
         numlockx, xorg, qt5, kde5

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         name = "lumina-${version}";

     

       7
       7
       +
         version = "1.1.0-p1";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "trueos";

     

       11
       11
       +
           repo = "lumina";

     

       12
       12
       +
           rev = "v${version}";

     

       13
       13
       +
           sha256 = "1kkb6v6p6w5mx1qdmcrq3r674k9ahpc6wlsb9pi2lq8qk9yaid0m";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         nativeBuildInputs = [

     

       17
       17
       +
           qt5.qmakeHook

     

       18
       18
       +
           qt5.qttools

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           xorg.libxcb

     

       23
       23
       +
           xorg.xcbutilwm

     

       24
       24
       +
           xorg.xcbutilimage

     

       25
       25
       +
           qt5.qtbase

     

       26
       26
       +
           qt5.qtsvg

     

       27
       27
       +
           qt5.qtmultimedia

     

       28
       28
       +
           qt5.qtx11extras

     

       29
       29
       +
           kde5.oxygen-icons5

     

       30
       30
       +
           fluxbox

     

       31
       31
       +
           xscreensaver

     

       32
       32
       +
           desktop_file_utils

     

       33
       33
       +
           numlockx

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         patches = [

     

       37
       37
       +
           ./avoid-absolute-path-on-sessdir.patch

     

       38
       38
       +
           ./LuminaOS-NixOS.cpp.patch

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         prePatch = ''

     

       42
       42
       +
           # Copy Gentoo setup as NixOS setup and then patch it

     

       43
       43
       +
           # TODO: write a complete NixOS setup?

     

       44
       44
       +
           cp -a src-qt5/core/libLumina/LuminaOS-Gentoo.cpp src-qt5/core/libLumina/LuminaOS-NixOS.cpp

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       47
       47
       +
         postPatch = ''

     

       48
       48
       +
           # Fix location of fluxbox styles

     

       49
       49
       +
           substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \

     

       50
       50
       +
             --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox"

     

       51
       51
       +
         '';

     

       52
       52
       +
       

     

       53
       53
       +
         qmakeFlags = [ "LINUX_DISTRO=NixOS" ];

     

       54
       54
       +
       

     

       55
       55
       +
         enableParallelBuilding = true;

     

       56
       56
       +
       

     

       57
       57
       +
         meta = with stdenv.lib; {

     

       58
       58
       +
           description = "A lightweight, portable desktop environment";

     

       59
       59
       +
           longDescription = ''

     

       60
       60
       +
             The Lumina Desktop Environment is a lightweight system interface

     

       61
       61
       +
             that is designed for use on any Unix-like operating system. It

     

       62
       62
       +
             is based on QT5.

     

       63
       63
       +
           '';

     

       64
       64
       +
           homepage = https://lumina-desktop.org;

     

       65
       65
       +
           license = licenses.bsd3;

     

       66
       66
       +
           platforms = platforms.unix;

     

       67
       67
       +
           maintainers = [ maintainers.romildo ];

     

       68
       68
       +
         };

     

       69
       69
       +
       }

pkgs/top-level/all-packages.nix

···

       16220
       16220
        
       

     

       16221
       16221
        
           in makeOverridable makePackages extra;

     

       16222
       16222
        
       

     

       16223
       16223
       +
         lumina = callPackage ../desktops/lumina { };

     

       16224
       16224
       +
       

     

       16223
       16225
        
         lxqt = recurseIntoAttrs (callPackage ../desktops/lxqt { });

     

       16224
       16226
        
       

     

       16225
       16227
        
         mate = recurseIntoAttrs (callPackage ../desktops/mate {