diff options
| author | TredwellGit <tredwell@tutanota.com> | 2022-01-08 09:27:54 +0000 |
|---|---|---|
| committer | TredwellGit <tredwell@tutanota.com> | 2022-01-09 01:52:23 +0000 |
| commit | 982aabffb59a4aa75363bb3d316decfe9f82a8dd (patch) | |
| tree | 3b464e2f15ddc7cd090fec443fdda229caa8275c /pkgs/servers/x11 | |
| parent | 6a9fc4441581e787ce8aec724a100a17817133a2 (diff) | |
| download | nixpkgs-982aabffb59a4aa75363bb3d316decfe9f82a8dd.tar nixpkgs-982aabffb59a4aa75363bb3d316decfe9f82a8dd.tar.gz nixpkgs-982aabffb59a4aa75363bb3d316decfe9f82a8dd.tar.bz2 nixpkgs-982aabffb59a4aa75363bb3d316decfe9f82a8dd.tar.lz nixpkgs-982aabffb59a4aa75363bb3d316decfe9f82a8dd.tar.xz nixpkgs-982aabffb59a4aa75363bb3d316decfe9f82a8dd.tar.zst nixpkgs-982aabffb59a4aa75363bb3d316decfe9f82a8dd.zip | |
xorg.xf86videonouveau: 1.0.17 -> 3ee7cbca8f9144a3bb5be7f71ce70558f548d268
Using the latest commit because abandoned upstream, but required for X server 21.1.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bc957480139..6628664363e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2337,11 +2337,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-nouveau"; - version = "1.0.17"; + version = "3ee7cbca8f9144a3bb5be7f71ce70558f548d268"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2"; - sha256 = "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9"; + url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2"; + sha256 = "0rhs3z274jdzd82pcsl25xn8hmw6i4cxs2kwfnphpfhxbbkiq7wl"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index def96d47a63..e3cffc186e2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -451,6 +451,10 @@ self: super: ]; }); + xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: { + nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [ autoreconfHook utilmacros ]; + }); + xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker meta = attrs.meta // { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0ecb0e474cb..dbab8a4774f 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -104,7 +104,7 @@ mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2 +https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 |