maxx: move deps from module to package
This commit is contained in:
parent
52deb4b460
commit
b73ae0a695
@ -5,20 +5,9 @@ with lib;
|
||||
let
|
||||
xcfg = config.services.xserver;
|
||||
cfg = xcfg.desktopManager.maxx;
|
||||
deps = [ pkgs.gcc ] ++ cfg.extraPackages;
|
||||
in {
|
||||
options.services.xserver.desktopManager.maxx = {
|
||||
enable = mkEnableOption "MaXX desktop environment";
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = with pkgs; [
|
||||
xorg.xclock xsettingsd
|
||||
];
|
||||
description = ''
|
||||
Extra packages visible to session.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf (xcfg.enable && cfg.enable) {
|
||||
@ -33,10 +22,6 @@ in {
|
||||
services.xserver.desktopManager.session = [
|
||||
{ name = "MaXX";
|
||||
start = ''
|
||||
export PATH="${makeBinPath deps}:$PATH"
|
||||
export GTK_PATH="${pkgs.gtk-engine-murrine}/lib/gtk-2.0:${pkgs.gtk_engines}/lib/gtk-2.0:$GTK_PATH"
|
||||
export GDK_PIXBUF_MODULE_FILE=$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)
|
||||
|
||||
exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
|
||||
'';
|
||||
}];
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl
|
||||
{ stdenv, fetchurl, makeWrapper
|
||||
, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
|
||||
, libXinerama, libXdamage, libICE, libXtst, libXaw
|
||||
, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses
|
||||
, bash }:
|
||||
, gcc, xclock, xsettingsd, bash, gtk-engine-murrine, gtk_engines, librsvg }:
|
||||
|
||||
let
|
||||
version = "Indy-1.1.0";
|
||||
@ -26,6 +26,8 @@ in stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
buildPhase = ''
|
||||
while IFS= read -r -d $'\0' i; do
|
||||
if isELF "$i"; then
|
||||
@ -47,8 +49,14 @@ in stdenv.mkDerivation {
|
||||
|
||||
mv -- ./* "$maxx"
|
||||
ln -s $maxx/share/icons $out/share
|
||||
|
||||
wrapProgram $maxx/etc/skel/Xsession.dt \
|
||||
--prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \
|
||||
--prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)"
|
||||
'';
|
||||
|
||||
propagatedUserEnvPkgs = [ gcc xclock xsettingsd ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A replica of IRIX Interactive Desktop";
|
||||
homepage = http://www.maxxinteractive.com;
|
||||
|
Loading…
Reference in New Issue
Block a user