wip/yesman
gnidorah 4 years ago committed by GitHub
parent 73c1532eff
commit b9d37e55a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      nixos/doc/manual/release-notes/rl-2009.xml
  2. 2
      nixos/modules/services/x11/desktop-managers/default.nix
  3. 31
      nixos/modules/services/x11/desktop-managers/maxx.nix
  4. 77
      pkgs/desktops/maxx/default.nix
  5. 2
      pkgs/top-level/all-packages.nix

@ -26,6 +26,12 @@
<listitem>
<para>GNOME desktop environment was upgraded to 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.</para>
</listitem>
<listitem>
<para>
<package>maxx</package> package removed along with <varname>services.xserver.desktopManager.maxx</varname> module.
Please migrate to <package>cdesktopenv</package> and <varname>services.xserver.desktopManager.cde</varname> module.
</para>
</listitem>
<listitem>
<para>
We now distribute a GNOME ISO.

@ -19,7 +19,7 @@ in
# E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
];

@ -1,31 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.maxx;
in {
options.services.xserver.desktopManager.maxx = {
enable = mkEnableOption "MaXX desktop environment";
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.maxx ];
# there is hardcoded path in binaries
system.activationScripts.setup-maxx = ''
mkdir -p /opt
ln -sfn ${pkgs.maxx}/opt/MaXX /opt
'';
services.xserver.desktopManager.session = [
{ name = "MaXX";
start = ''
exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
'';
}];
};
meta.maintainers = [ maintainers.gnidorah ];
}

@ -1,77 +0,0 @@
{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, gnused
, gcc, bash, gtk-engine-murrine, gtk_engines, librsvg
, 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, libGL, ncurses5
, dmidecode, pciutils, usbutils
}:
stdenv.mkDerivation rec {
pname = "MaXX";
version = "2.0.1";
codename = "Indigo";
srcs = [
(fetchurl {
url = "http://maxxdesktop.arcadedaydream.com/${codename}-Releases/Installers/MaXX-${codename}-${version}-x86_64.tar.gz";
sha256 = "17hd3j8773kmvvhyf657in6zmhnw4mbvyn4r6dfip5bdaz66pj01";
})
];
nativeBuildInputs = [ makeWrapper autoPatchelfHook gnused ];
buildInputs = [
stdenv.cc.cc 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 libGL ncurses5
];
buildPhase = ''
sed -i "s/\(LD_LIBRARY_PATH=.*\)$/\1:\$LD_LIBRARY_PATH/p" etc/system.desktopenv
substituteInPlace bin/adminterm \
--replace /bin/bash ${bash}/bin/bash
substituteInPlace share/misc/HOME/initMaXX-Desktop-Home.sh \
--replace "cp " "cp --no-preserve=mode "
'';
installPhase = ''
maxx=$out/opt/MaXX
mkdir -p "$maxx" $out/share $maxx/sbin
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)"
while IFS= read -r -d ''$'\0' i; do
if isExecutable "$i"; then
wrapProgram "$i" \
--prefix PATH : ${gcc}/bin
fi
done < <(find "$maxx" -type f -print0)
wrapProgram $maxx/bin/hinv \
--prefix PATH : ${stdenv.lib.makeBinPath [ dmidecode pciutils usbutils ]}
'';
meta = with stdenv.lib; {
description = "A replica of IRIX Interactive Desktop";
homepage = "https://www.facebook.com/maxxdesktop/";
license = {
fullName = "The MaXX Interactive Desktop for Linux License Agreement";
url = "http://maxxdesktop.arcadedaydream.com/Indigo-Releases/docs/license.html";
free = false; # redistribution is only allowed to *some* hardware, etc.
};
maintainers = [ maintainers.gnidorah ];
platforms = ["x86_64-linux"];
longDescription = ''
A clone of IRIX Interactive Desktop made in agreement with SGI.
Provides simple and fast retro desktop environment.
'';
};
}

@ -24287,8 +24287,6 @@ in
pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
maxx = callPackage ../desktops/maxx { };
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
inherit (callPackages ../applications/misc/redshift {

Loading…
Cancel
Save