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

Merge pull request #6676 from abbradar/smallfixes

Browse Source 
Small fixes
This commit is contained in:
Nikolay Amiantov 2015-03-05 21:02:12 +03:00
commit ac700c6dec
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/uim.nix
View File

@ -7,14 +7,16 @@ let
in in
{ {
options = { options = {
uim = { uim = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
example = true; example = true;
description = "enable UIM input method"; description = "Enable UIM input method";
}; };
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {

2
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -97,7 +97,7 @@ in
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
execCmd = '' execCmd = ''
export PATH=${lightdm}/sbin:$PATH 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}
''; '';
}; };

5
pkgs/misc/cups/drivers/samsung/default.nix
View File

@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
builder = ./builder.sh; builder = ./builder.sh;
meta = { meta = with stdenv.lib; {
description = "Samsung's Linux drivers; includes binaries without source code"; description = "Samsung's Linux drivers; includes binaries without source code";
homepage = "http://www.samsung.com/"; homepage = "http://www.samsung.com/";
license = "samsung"; # Binary-only license = licenses.unfree;
platforms = platforms.linux;
}; };
} }

2
pkgs/tools/inputmethods/uim/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
version = "1.8.6"; version = "1.8.6";