diff options
| author | tv <tv@krebsco.de> | 2016-07-03 20:44:09 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-07-03 20:44:09 +0200 |
| commit | 7f0ea39a978fb02b4b165e82051f83273093a94c (patch) | |
| tree | 45ea0a22523aecad81403d3d20c9f3c69439d307 /lass/5pkgs | |
| parent | 8822005f00be111186a490934ebb9adbfd7917a2 (diff) | |
| parent | e4f4811fa7a7f3eaa620d2c536d7b74659bd2943 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/5pkgs')
| -rw-r--r-- | lass/5pkgs/ejabberd/default.nix | 28 | ||||
| -rw-r--r-- | lass/5pkgs/xmonad-lass.nix | 12 |
2 files changed, 34 insertions, 6 deletions
diff --git a/lass/5pkgs/ejabberd/default.nix b/lass/5pkgs/ejabberd/default.nix new file mode 100644 index 000000000..3a77c5cd1 --- /dev/null +++ b/lass/5pkgs/ejabberd/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}: + +stdenv.mkDerivation rec { + version = "2.1.13"; + name = "ejabberd-${version}"; + src = fetchurl { + url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; + sha256 = "0vf8mfrx7vr3c5h3nfp3qcgwf2kmzq20rjv1h9sk3nimwir1q3d8"; + }; + buildInputs = [ expat erlang zlib openssl pam ]; + patchPhase = '' + sed -i \ + -e "s|erl \\\|${erlang}/bin/erl \\\|" \ + -e 's|EXEC_CMD=\"sh -c\"|EXEC_CMD=\"${stdenv.shell} -c\"|' \ + src/ejabberdctl.template + ''; + preConfigure = '' + cd src + ''; + configureFlags = ["--enable-pam"]; + + meta = { + description = "Open-source XMPP application server written in Erlang"; + license = stdenv.lib.licenses.gpl2; + homepage = http://www.ejabberd.im; + maintainers = [ lib.maintainers.sander ]; + }; +} diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix index 841821a7a..c07bd2b83 100644 --- a/lass/5pkgs/xmonad-lass.nix +++ b/lass/5pkgs/xmonad-lass.nix @@ -46,7 +46,7 @@ import XMonad.Util.EZConfig (additionalKeysP) myTerm :: String -myTerm = "urxvtc" +myTerm = "${pkgs.rxvt_unicode}/bin/urxvtc" myFont :: String myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*" @@ -108,11 +108,11 @@ displaySomeException = displayException myKeyMap :: [([Char], X ())] myKeyMap = [ ("M4-<F11>", spawn "i3lock -i /var/lib/wallpaper/wallpaper -f") - , ("M4-p", spawn "passmenu --type") - , ("<XF86AudioRaiseVolume>", spawn "pactl -- set-sink-volume 0 +4%") - , ("<XF86AudioLowerVolume>", spawn "pactl -- set-sink-volume 0 -4%") - , ("<XF86AudioMute>", spawn "pactl -- set-sink-mute 0 toggle") - , ("<XF86AudioMicMute>", spawn "pactl -- set-source-mute 1 toggle") + , ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type") + , ("<XF86AudioRaiseVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume 0 +4%") + , ("<XF86AudioLowerVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume 0 -4%") + , ("<XF86AudioMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-mute 0 toggle") + , ("<XF86AudioMicMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-source-mute 1 toggle") , ("<XF86Launch1>", gridselectWorkspace gridConfig W.view) , ("<XF86MonBrightnessUp>", spawn "xbacklight -steps 1 -time 1 -inc 3") , ("<XF86MonBrightnessDown>", spawn "xbacklight -steps 1 -time 1 -dec 3") |