From 9a21011f08fa9e172cd4654cf1485217e33f8da4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Mar 2015 19:04:48 +0300
Subject: [PATCH 1/4] uim: don't accept additional arguments

---
 pkgs/tools/inputmethods/uim/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 1da552a46e2..160efe2ded8 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy, ... }:
+{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy}:
 
 stdenv.mkDerivation rec {
   version = "1.8.6";

From 0c5169b5367268803ec9c686822ff924ec71b3d1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Mar 2015 19:05:29 +0300
Subject: [PATCH 2/4] samsung-UnifiedLinuxDriver: fix meta

---
 pkgs/misc/cups/drivers/samsung/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index ab0c0dc25e4..3d111ec5942 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
 
   builder = ./builder.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Samsung's Linux drivers; includes binaries without source code";
     homepage = "http://www.samsung.com/";
-    license = "samsung";  # Binary-only
+    license = licenses.unfree;
+    platforms = platforms.linux;
   };
 }

From 264c6892f2e232e8a7966155257444490bee4dc8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Mar 2015 19:06:05 +0300
Subject: [PATCH 3/4] nixos/uim: capitalize description

---
 nixos/modules/programs/uim.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/uim.nix b/nixos/modules/programs/uim.nix
index fc25ba6f969..4bf2f9a1757 100644
--- a/nixos/modules/programs/uim.nix
+++ b/nixos/modules/programs/uim.nix
@@ -7,14 +7,16 @@ let
 in
 {
   options = {
+
     uim = {
       enable = mkOption {
         type = types.bool;
         default = false;
         example = true;
-        description = "enable UIM input method";
+        description = "Enable UIM input method";
       };
     };
+
   };
 
   config = mkIf cfg.enable {

From 4f317767dab206fcb1c636478e8feda51318d1bd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Mar 2015 19:08:30 +0300
Subject: [PATCH 4/4] lightdm: don't leave a shell running

---
 nixos/modules/services/x11/display-managers/lightdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 98e3fd6d6a5..6cccb37a474 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -97,7 +97,7 @@ in
       # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
       execCmd = ''
         export PATH=${lightdm}/sbin:$PATH
-        ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf}
+        exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf}
       '';
     };