alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

slim: remove duplicate code

Browse source
This commit is contained in:
Arseniy Seroka 2014-03-09 14:32:02 +04:00
parent d573ea576f
commit f7d5e83abb
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/maintainers.nix
View file

@ -31,6 +31,7 @@
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
iElectric = "Domen Kozar <domen@dev.si>"; iElectric = "Domen Kozar <domen@dev.si>";
iyzsong = "Song Wenwu <iyzsong@gmail.com>"; iyzsong = "Song Wenwu <iyzsong@gmail.com>";
JagaJaga = "Arseniy Seroka <ars.seroka@gmail.com>";
jcumming = "Jack Cummings <jack@mudshark.org>"; jcumming = "Jack Cummings <jack@mudshark.org>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>"; ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";

4
nixos/modules/services/x11/display-managers/slim.nix
View file

@ -85,7 +85,9 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.slim; default = pkgs.slim.override {
theme = slimThemesDir;
};
description = '' description = ''
Configure slim package. Configure slim package.
''; '';

13
pkgs/applications/display-managers/slim/default.nix
View file

@ -2,18 +2,7 @@
, fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs, theme ? null }: , fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs, theme ? null }:
let let
slimThemesDir = slimThemesDir = if theme == null then "$out/share/slim/themes" else theme;
let
unpackedTheme = pkgs.stdenv.mkDerivation {
name = "slim-theme";
buildCommand = ''
ensureDir $out
cd $out
unpackFile ${theme}
ln -s * default
'';
};
in if theme == null then "$out/share/slim/themes" else unpackedTheme;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {