git.iko.soy/typeable/nixpkgs
on master help sign in
xorg: Don't use deprecated item
commit88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateThu 18 Oct 2018, 11:51 (8 years ago) parent47bf3f3
2 files changed+2−2
pkgs/servers/x11/xorg/overrides.nix+1−1 pkgs/top-level/all-packages.nix+1−1
pkgs/servers/x11/xorg/overrides.nix+1−1
@@ -15,7 +15,7 @@ let
1515 (stdenv.hostPlatform != stdenv.buildPlatform)
1616 "--enable-malloc0returnsnull";
1717in
18−super: self:
18+self: super:
1919{
2020 bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
2121 buildInputs = attrs.buildInputs ++ [ self.xproto self.fontsproto ];
pkgs/top-level/all-packages.nix+1−1
@@ -13576,7 +13576,7 @@ with pkgs;
1357613576 # so as not to have the newly bound xorg items already in scope, which would
1357713577 # have created a cycle.
1357813578 xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg {
13579− }).overrideScope (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
13579+ }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
1358013580 inherit (darwin) apple_sdk;
1358113581 bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
1358213582 python = python2; # Incompatible with Python 3x