diff options
117 files changed, 406 insertions, 406 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index 3e4ac3f3c6b1..7fd30cabf16b 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -248,7 +248,7 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> targetPkgs = pkgs: (with pkgs; [ udev alsaLib - ]) ++ (with pkgs.xlibs; + ]) ++ (with pkgs.xorg; [ libX11 libXcursor libXrandr diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 887b6f88a741..c9a563768323 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -106,7 +106,7 @@ in systemd.services.display-manager.wants = [ "systemd-machined.service" ]; systemd.services.display-manager.after = [ "systemd-machined.service" ]; - systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ]; + systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ]; services.dbus.packages = [ gdm ]; diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index d0b69c5452c2..558f5e8cfc7e 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -19,7 +19,7 @@ let ''} [X-*-Core] - Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb + Xrdb=${pkgs.xorg.xrdb}/bin/xrdb SessionsDirs=${dmcfg.session.desktops} Session=${dmcfg.session.script} FailsafeClient=${pkgs.xterm}/bin/xterm diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 3ab113c92e89..9476fbaf3359 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs -, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg +, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper , mpg123, neon, faad2 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { |