diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-10-18 11:51:13 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-10-18 11:54:20 -0400 |
| commit | 88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7 (patch) | |
| tree | f4a8018da6040751c5234be4d6e414896ad71457 | |
| parent | 47bf3f3d3fac32432b182d83dbc59acc6fe54211 (diff) | |
| download | nixlib-88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7.tar nixlib-88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7.tar.gz nixlib-88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7.tar.bz2 nixlib-88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7.tar.lz nixlib-88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7.tar.xz nixlib-88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7.tar.zst nixlib-88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7.zip | |
xorg: Don't use deprecated item
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ffee894fa60f..4cd121153cf4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -15,7 +15,7 @@ let (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; in -super: self: +self: super: { bdftopcf = super.bdftopcf.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ self.xproto self.fontsproto ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 164d1c0ac071..a2152113ae57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13576,7 +13576,7 @@ with pkgs; # so as not to have the newly bound xorg items already in scope, which would # have created a cycle. 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; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; python = python2; # Incompatible with Python 3x |