diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/slim.nix | 4 | ||||
| -rw-r--r-- | 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 938e1ed54550..944935425e3a 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 29cdc4cdabcf..b4f42ec7649c 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 96c9e149c9f1..caf8a7c4222e 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 { |