diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-04 20:54:57 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-04 20:54:57 +0400 |
| commit | a3b9bf6c87f1423ffbc20ae07a21977aaa19b436 (patch) | |
| tree | 53794bcefba911a7e845d7f272341d8a4159d00d /nixos/modules | |
| parent | 3bc8f9ad02506aef39f25c0ea627c37d4535f141 (diff) | |
| parent | 8f1623b38bd3569dba6d86cf7281deef0c7758c4 (diff) | |
| download | nixpkgs-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar nixpkgs-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.gz nixpkgs-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.bz2 nixpkgs-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.lz nixpkgs-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.xz nixpkgs-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.tar.zst nixpkgs-a3b9bf6c87f1423ffbc20ae07a21977aaa19b436.zip | |
Merge pull request #3653 from iyzsong/nixos/xfce4-mixer
nixos: don't set variables for gstreamer-0.10 (fix #3652)
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/programs/environment.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 4a510805b01..6bf98442013 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -47,7 +47,6 @@ in TERMINFO_DIRS = [ "${i}/share/terminfo" ]; PERL5LIB = [ "${i}/lib/perl5/site_perl" ]; ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ]; - GST_PLUGIN_SYSTEM_PATH = [ "${i}/lib/gstreamer-0.10" ]; KDEDIRS = [ "${i}" ]; STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ]; QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index a72eea76239..a31f66176cc 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -34,10 +34,6 @@ in # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. export GTK_DATA_PREFIX=${config.system.path} - # Necessary to get xfce4-mixer to find GST's ALSA plugin. - # Ugly. - export GST_PLUGIN_PATH=${config.system.path}/lib - exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} ''; }; |