* SLiM, a lightweight display manager.

svn path=/nixpkgs/trunk/; revision=8044
This commit is contained in:
Eelco Dolstra 2007-02-25 22:25:25 +00:00
parent 9a457db61d
commit 3a37abc3ce
3 changed files with 61 additions and 0 deletions

View File

@ -0,0 +1,15 @@
{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype}:
stdenv.mkDerivation {
name = "slim-1.2.6";
src = fetchurl {
url = http://download.berlios.de/slim/slim-1.2.6.tar.gz;
sha256 = "0plcmm955rnv67sx67ka6dccanr4rfzwzvsj6lnr8kqdip4522jg";
};
patches = [./runtime-paths.patch];
buildInputs = [x11 libjpeg libpng libXmu freetype];
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
preBuild = "
makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc)
";
}

View File

@ -0,0 +1,41 @@
diff -rc slim-1.2.6-orig/app.cpp slim-1.2.6/app.cpp
*** slim-1.2.6-orig/app.cpp Fri Sep 15 23:00:37 2006
--- slim-1.2.6/app.cpp Sun Feb 25 17:30:50 2007
***************
*** 113,119 ****
// Read configuration and theme
cfg = new Cfg;
! cfg->readConf(CFGFILE);
string themebase = "";
string themefile = "";
string themedir = "";
--- 113,121 ----
// Read configuration and theme
cfg = new Cfg;
! char *cfgfile = getenv("SLIM_CFGFILE");
! if (!cfgfile) cfgfile = CFGFILE;
! cfg->readConf(cfgfile);
string themebase = "";
string themefile = "";
string themedir = "";
***************
*** 121,127 ****
if (testing) {
themeName = testtheme;
} else {
! themebase = string(THEMESDIR) + "/";
themeName = cfg->getOption("current_theme");
string::size_type pos;
if ((pos = themeName.find(",")) != string::npos) {
--- 123,131 ----
if (testing) {
themeName = testtheme;
} else {
! char *themesdir = getenv("SLIM_THEMESDIR");
! if (!themesdir) themesdir = THEMESDIR;
! themebase = string(themesdir) + "/";
themeName = cfg->getOption("current_theme");
string::size_type pos;
if ((pos = themeName.find(",")) != string::npos) {

View File

@ -2793,6 +2793,11 @@ rec {
inherit fetchurl stdenv;
};
slim = import ../applications/display-managers/slim {
inherit fetchurl stdenv x11 libjpeg libpng freetype;
inherit (xlibs) libXmu;
};
spoofax = import ../applications/editors/eclipse/plugins/spoofax {
inherit fetchurl stdenv;
};