public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maxx: move deps from module to package

Browse Source
This commit is contained in:
gnidorah 2017-08-14 11:13:49 +03:00
parent 52deb4b460
commit b73ae0a695
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/x11/desktop-managers/maxx.nix
View File

@ -5,20 +5,9 @@ with lib;
let let
xcfg = config.services.xserver; xcfg = config.services.xserver;
cfg = xcfg.desktopManager.maxx; cfg = xcfg.desktopManager.maxx;
deps = [ pkgs.gcc ] ++ cfg.extraPackages;
in { in {
options.services.xserver.desktopManager.maxx = { options.services.xserver.desktopManager.maxx = {
enable = mkEnableOption "MaXX desktop environment"; 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) { config = mkIf (xcfg.enable && cfg.enable) {
@ -33,10 +22,6 @@ in {
services.xserver.desktopManager.session = [ services.xserver.desktopManager.session = [
{ name = "MaXX"; { name = "MaXX";
start = '' 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 exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
''; '';
}]; }];

12
pkgs/desktops/maxx/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl { stdenv, fetchurl, makeWrapper
, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
, libXinerama, libXdamage, libICE, libXtst, libXaw , libXinerama, libXdamage, libICE, libXtst, libXaw
, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses , fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses
, bash }: , gcc, xclock, xsettingsd, bash, gtk-engine-murrine, gtk_engines, librsvg }:
let let
version = "Indy-1.1.0"; version = "Indy-1.1.0";
@ -26,6 +26,8 @@ in stdenv.mkDerivation {
}) })
]; ];
buildInputs = [ makeWrapper ];
buildPhase = '' buildPhase = ''
while IFS= read -r -d $'\0' i; do while IFS= read -r -d $'\0' i; do
if isELF "$i"; then if isELF "$i"; then
@ -47,8 +49,14 @@ in stdenv.mkDerivation {
mv -- ./* "$maxx" mv -- ./* "$maxx"
ln -s $maxx/share/icons $out/share 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; { meta = with stdenv.lib; {
description = "A replica of IRIX Interactive Desktop"; description = "A replica of IRIX Interactive Desktop";
homepage = http://www.maxxinteractive.com; homepage = http://www.maxxinteractive.com;