diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d49dc207133..464a23c8520 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3381,8 +3381,6 @@ let automake = automake112x; - automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; - automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; @@ -4381,9 +4379,9 @@ let cupsSupport = config.gtk2.cups or stdenv.isLinux; }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { inherit (gnome3) at_spi2_atk; - }); + }; gtk = pkgs.gtk2; @@ -6364,9 +6362,8 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig libxslt expat libdrm libpng zlib perl mesa_drivers - xkeyboard_config dbus libuuid openssl gperf m4 - autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman; - automake = automake110x; + dbus libuuid openssl gperf m4 + autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman; mesa = mesa_noglu; }); @@ -7148,10 +7145,7 @@ let inherit (xorg) fontsproto renderproto utilmacros xorgserver; }; - xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { - inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto - videoproto utilmacros; - }; + xf86_video_nouveau = xorg.xf86videonouveau; xmoto = builderDefsPackage (import ../games/xmoto) { inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng @@ -7305,7 +7299,7 @@ let xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; - xkeyboard_config = callPackage ../data/misc/xkeyboard-config { }; + xkeyboard_config = xorg.xkeyboardconfig; ### APPLICATIONS |