JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xorg: Don't use deprecated item

Browse Source
This commit is contained in:
John Ericson 2018-10-18 11:51:13 -04:00
parent 47bf3f3d3f
commit 88cd633ea4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/x11/xorg/overrides.nix
View File

@ -15,7 +15,7 @@ let
(stdenv.hostPlatform != stdenv.buildPlatform) (stdenv.hostPlatform != stdenv.buildPlatform)
"--enable-malloc0returnsnull"; "--enable-malloc0returnsnull";
in in
super: self: self: super:
{ {
bdftopcf = super.bdftopcf.overrideAttrs (attrs: { bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.xproto self.fontsproto ]; buildInputs = attrs.buildInputs ++ [ self.xproto self.fontsproto ];

2
pkgs/top-level/all-packages.nix
View File

@ -13576,7 +13576,7 @@ with pkgs;
# so as not to have the newly bound xorg items already in scope, which would # so as not to have the newly bound xorg items already in scope, which would
# have created a cycle. # have created a cycle.
xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg {
}).overrideScope (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
inherit (darwin) apple_sdk; inherit (darwin) apple_sdk;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
python = python2; # Incompatible with Python 3x python = python2; # Incompatible with Python 3x