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

slim: Update to 1.3.6

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-15 12:51:41 +02:00
parent 347132478b
commit 1d634b4388
2 changed files with 41 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/display-managers/slim/default.nix
View File

@ -1,29 +1,32 @@
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng, libXmu { stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng
, fontconfig, freetype, pam, dbus_libs }: , fontconfig, freetype, pam, dbus_libs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slim-1.3.4"; name = "slim-1.3.6";
src = fetchurl { src = fetchurl {
url = "http://download.berlios.de/slim/${name}.tar.gz"; url = "http://download.berlios.de/slim/${name}.tar.gz";
sha256 = "00fmrg2v41jnqhx0yc1kv97xxh5gai18n0i4as9g1fcq1i32cp0m"; sha256 = "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1";
}; };
patches = [ patches =
# Allow the paths of the configuration file and theme directory to [ # Allow the paths of the configuration file and theme directory to
# be set at runtime. # be set at runtime.
./runtime-paths.patch ./runtime-paths.patch
]; ];
buildInputs = preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc --replace /lib $out/lib";
[ cmake pkgconfig x11 libjpeg libpng libXmu fontconfig freetype
pam dbus_libs
];
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
cmakeFlags = [ "-DUSE_PAM=1" ]; cmakeFlags = [ "-DUSE_PAM=1" ];
enableParallelBuilding = true;
buildInputs =
[ cmake pkgconfig libjpeg libpng fontconfig freetype
pam dbus_libs
xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft
];
NIX_CFLAGS_LINK = "-lXmu"; NIX_CFLAGS_LINK = "-lXmu";
meta = { meta = {

44
pkgs/applications/display-managers/slim/runtime-paths.patch
View File

@ -1,41 +1,25 @@
diff -rc slim-1.2.6-orig/app.cpp slim-1.2.6/app.cpp diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
*** slim-1.2.6-orig/app.cpp Fri Sep 15 23:00:37 2006 --- slim-1.3.6-orig/app.cpp 2013-10-02 00:38:05.000000000 +0200
--- slim-1.2.6/app.cpp Sun Feb 25 17:30:50 2007 +++ slim-1.3.6/app.cpp 2013-10-15 11:02:55.629263422 +0200
*************** @@ -200,7 +200,9 @@
*** 113,119 ****
// Read configuration and theme /* Read configuration and theme */
cfg = new Cfg; cfg = new Cfg;
! cfg->readConf(CFGFILE); - cfg->readConf(CFGFILE);
+ char *cfgfile = getenv("SLIM_CFGFILE");
+ if (!cfgfile) cfgfile = CFGFILE;
+ cfg->readConf(cfgfile);
string themebase = ""; string themebase = "";
string themefile = ""; string themefile = "";
string themedir = ""; string themedir = "";
--- 113,121 ---- @@ -208,7 +210,9 @@
// 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) { if (testing) {
themeName = testtheme; themeName = testtheme;
} else { } else {
! themebase = string(THEMESDIR) + "/"; - themebase = string(THEMESDIR) + "/";
themeName = cfg->getOption("current_theme"); + char *themesdir = getenv("SLIM_THEMESDIR");
string::size_type pos; + if (!themesdir) themesdir = THEMESDIR;
if ((pos = themeName.find(",")) != string::npos) { + themebase = string(themesdir) + "/";
--- 123,131 ----
if (testing) {
themeName = testtheme;
} else {
! char *themesdir = getenv("SLIM_THEMESDIR");
! if (!themesdir) themesdir = THEMESDIR;
! themebase = string(themesdir) + "/";
themeName = cfg->getOption("current_theme"); themeName = cfg->getOption("current_theme");
string::size_type pos; string::size_type pos;
if ((pos = themeName.find(",")) != string::npos) { if ((pos = themeName.find(",")) != string::npos) {