e18: remove old desktop manager
This commit is contained in:
Matej Cotman
parent
959946a5af
commit
084fb3a0d3
@ -19,7 +19,7 @@ in
|
|||||||
# E.g., if KDE is enabled, it supersedes xterm.
|
# E.g., if KDE is enabled, it supersedes xterm.
|
||||||
imports = [
|
imports = [
|
||||||
./none.nix ./xterm.nix ./xfce.nix ./kde4.nix
|
./none.nix ./xterm.nix ./xfce.nix ./kde4.nix
|
||||||
./e18.nix ./e19.nix ./gnome3.nix ./xbmc.nix
|
./e19.nix ./gnome3.nix ./xbmc.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|||||||
@ -1,43 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
xcfg = config.services.xserver;
|
|
||||||
cfg = xcfg.desktopManager.e18;
|
|
||||||
e18_enlightenment = pkgs.e18.enlightenment.override { set_freqset_setuid = true; };
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
|
|
||||||
services.xserver.desktopManager.e18.enable = mkOption {
|
|
||||||
default = false;
|
|
||||||
example = true;
|
|
||||||
description = "Enable the E18 desktop environment.";
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf (xcfg.enable && cfg.enable) {
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.e18.efl pkgs.e18.evas pkgs.e18.emotion pkgs.e18.elementary e18_enlightenment
|
|
||||||
pkgs.e18.terminology pkgs.e18.econnman
|
|
||||||
];
|
|
||||||
|
|
||||||
services.xserver.desktopManager.session = [
|
|
||||||
{ name = "E18";
|
|
||||||
start = ''
|
|
||||||
${e18_enlightenment}/bin/enlightenment_start
|
|
||||||
waitPID=$!
|
|
||||||
'';
|
|
||||||
}];
|
|
||||||
|
|
||||||
security.setuidPrograms = [ "e18_freqset" ];
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
{ callPackage, pkgs }:
|
|
||||||
rec {
|
|
||||||
#### CORE EFL
|
|
||||||
efl = callPackage ./efl.nix { };
|
|
||||||
evas = callPackage ./evas.nix { };
|
|
||||||
emotion = callPackage ./emotion.nix { };
|
|
||||||
elementary = callPackage ./elementary.nix { };
|
|
||||||
|
|
||||||
#### WINDOW MANAGER
|
|
||||||
enlightenment = callPackage ./enlightenment.nix { };
|
|
||||||
|
|
||||||
#### APPLICATIONS
|
|
||||||
econnman = callPackage ./econnman.nix { };
|
|
||||||
terminology = callPackage ./terminology.nix { };
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, e18, python27, python27Packages, dbus, makeWrapper }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "econnman-${version}";
|
|
||||||
version = "1.1";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
|
|
||||||
sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ makeWrapper pkgconfig e18.efl python27 dbus ];
|
|
||||||
propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus e18.elementary ];
|
|
||||||
postInstall = ''
|
|
||||||
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Econnman is a user interface for the connman network connection manager";
|
|
||||||
homepage = http://enlightenment.org/;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
license = stdenv.lib.licenses.lgpl3;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "efl-${version}";
|
|
||||||
version = "1.10.2";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
|
|
||||||
sha256 = "0py8x0kv2hgl5v983xb6653fvmvn20im6picpc0hqfyxy09g1b24";
|
|
||||||
};
|
|
||||||
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ];
|
|
||||||
propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ];
|
|
||||||
configureFlags = [ "--with-opengl=full" "--with-tests=none" "--enable-wayland" "--enable-sdl" "--enable-drm" ];
|
|
||||||
preConfigure = ''
|
|
||||||
export NIX_CFLAGS_COMPILE="-I${xlibs.libXtst} $NIX_CFLAGS_COMPILE"
|
|
||||||
export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
|
|
||||||
'';
|
|
||||||
meta = {
|
|
||||||
description = "Enlightenment Core libraries";
|
|
||||||
homepage = http://enlightenment.org/;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
license = stdenv.lib.licenses.lgpl3;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, e18 }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "elementary-${version}";
|
|
||||||
version = "1.10.2";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
|
|
||||||
sha256 = "0y3knvmabl9adc8pd54p7qxpf7gvciixc1rk40hqppwhdgbgpz28";
|
|
||||||
};
|
|
||||||
buildInputs = [ pkgconfig e18.efl ];
|
|
||||||
preConfigure = ''
|
|
||||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
|
|
||||||
'';
|
|
||||||
meta = {
|
|
||||||
description = "Widget set/toolkit";
|
|
||||||
homepage = http://enlightenment.org/;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
license = stdenv.lib.licenses.lgpl2;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, e18, vlc }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "emotion_generic_players-${version}";
|
|
||||||
version = "1.10.0";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
|
|
||||||
sha256 = "1nwlrk9inrhiv6jpzji10ikcdlhzhz7f2b5qhi2ai8bb6j61ryyc";
|
|
||||||
};
|
|
||||||
buildInputs = [ pkgconfig e18.efl vlc ];
|
|
||||||
preConfigure = ''
|
|
||||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
|
|
||||||
'';
|
|
||||||
meta = {
|
|
||||||
description = "Extra video decoders";
|
|
||||||
homepage = http://enlightenment.org/;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
license = stdenv.lib.licenses.bsd2;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit, bzip2, set_freqset_setuid ? false }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "enlightenment-${version}";
|
|
||||||
version = "0.18.8";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz";
|
|
||||||
sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l";
|
|
||||||
};
|
|
||||||
buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 ];
|
|
||||||
preConfigure = ''
|
|
||||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
|
|
||||||
'';
|
|
||||||
|
|
||||||
# this is a hack and without this cpufreq module is not working:
|
|
||||||
# when set_freqset_setuid is true and "e18_freqset" is set in setuidPrograms (this is taken care of in e18 NixOS module),
|
|
||||||
# then this postInstall does the folowing:
|
|
||||||
# 1. moves the "freqset" binary to "e18_freqset",
|
|
||||||
# 2. linkes "e18_freqset" to enlightenment/bin so that,
|
|
||||||
# 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e18_freqset,
|
|
||||||
# 4. and finaly, linkes /var/setuid-wrappers/e18_freqset to original destination where enlightenment wants it
|
|
||||||
postInstall = if set_freqset_setuid then ''
|
|
||||||
export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`;
|
|
||||||
mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e18_freqset
|
|
||||||
ln -sv $CPUFREQ_DIRPATH/e18_freqset $out/bin/e18_freqset
|
|
||||||
ln -sv /var/setuid-wrappers/e18_freqset $CPUFREQ_DIRPATH/freqset
|
|
||||||
'' else "";
|
|
||||||
meta = {
|
|
||||||
description = "The Compositing Window Manager and Desktop Shell";
|
|
||||||
homepage = http://enlightenment.org/;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
license = stdenv.lib.licenses.bsd2;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, e18, zlib }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "evas_generic_loaders-${version}";
|
|
||||||
version = "1.10.0";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
|
|
||||||
sha256 = "0qx44g7a8pzcgspx8q10zjiwzafis301fhpchd4pskfxhqd4qagm";
|
|
||||||
};
|
|
||||||
buildInputs = [ pkgconfig e18.efl zlib ];
|
|
||||||
meta = {
|
|
||||||
description = "Extra image decoders";
|
|
||||||
homepage = http://enlightenment.org/;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
license = stdenv.lib.licenses.gpl2;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, e18 }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "terminology-${version}";
|
|
||||||
version = "0.6.1";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
|
|
||||||
sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x";
|
|
||||||
};
|
|
||||||
buildInputs = [ pkgconfig e18.efl e18.elementary ];
|
|
||||||
preConfigure = ''
|
|
||||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
|
|
||||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE"
|
|
||||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE"
|
|
||||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
|
|
||||||
'';
|
|
||||||
meta = {
|
|
||||||
description = "The best terminal emulator written with the EFL";
|
|
||||||
homepage = http://enlightenment.org/;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
license = stdenv.lib.licenses.bsd2;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -11718,11 +11718,6 @@ let
|
|||||||
|
|
||||||
enlightenment = callPackage ../desktops/enlightenment { };
|
enlightenment = callPackage ../desktops/enlightenment { };
|
||||||
|
|
||||||
e18 = recurseIntoAttrs (
|
|
||||||
let callPackage = newScope pkgs.e18; in
|
|
||||||
import ../desktops/e18 { inherit callPackage pkgs; }
|
|
||||||
);
|
|
||||||
|
|
||||||
e19 = recurseIntoAttrs (
|
e19 = recurseIntoAttrs (
|
||||||
let callPackage = newScope pkgs.e19; in
|
let callPackage = newScope pkgs.e19; in
|
||||||
import ../desktops/e19 { inherit callPackage pkgs; }
|
import ../desktops/e19 { inherit callPackage pkgs; }
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user