From b73ae0a695f3fec59d4d0c4613496e40e3c795c4 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 14 Aug 2017 11:13:49 +0300
Subject: [PATCH] maxx: move deps from module to package

---
 .../services/x11/desktop-managers/maxx.nix        | 15 ---------------
 pkgs/desktops/maxx/default.nix                    | 12 ++++++++++--
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
index bceb23c276e3..6a698658bdd6 100644
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -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
       '';
     }];
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 8cceb5a05d3e..5bcc6e841521 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -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;