From aaf01268ffde61bd970df886fb2d11f8dc96175d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 30 Mar 2014 17:03:15 +0200
Subject: [PATCH] Revert "slim: remove duplicate code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f7d5e83abbe95ed06aac58f4d1a2e971fae4d186.  It
breaks the Firefox and Xfce tests:

  in job ‘tests.firefox.x86_64-linux’:
  cannot coerce a boolean to a string

  in job ‘tests.xfce.x86_64-linux’:
  infinite recursion encountered
---
 lib/maintainers.nix                                 |  1 -
 .../modules/services/x11/display-managers/slim.nix  |  4 +---
 pkgs/applications/display-managers/slim/default.nix | 13 ++++++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 938e1ed5455..944935425e3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -37,7 +37,6 @@
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
-  JagaJaga = "Arseniy Seroka <ars.seroka@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 29cdc4cdabc..b4f42ec7649 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -85,9 +85,7 @@ in
       
       package = mkOption {
         type = types.package;
-        default = pkgs.slim.override { 
-          theme = slimThemesDir; 
-          };
+        default = pkgs.slim;
         description = ''
           Configure slim package.
         '';
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 96c9e149c9f..caf8a7c4222 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -2,7 +2,18 @@
 , fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs, theme ? null }:
 
 let 
-  slimThemesDir = if theme == null then "$out/share/slim/themes" else theme;
+  slimThemesDir =
+      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
 
 stdenv.mkDerivation rec {