Unverified Commit b565132d authored by quantenzitrone's avatar quantenzitrone
Browse files

xf86-video-nouveau: 3ee7cbc... -> 1.0.18, refactor, move to pkgs/by-name &...

xf86-video-nouveau: 3ee7cbc... -> 1.0.18, refactor, move to pkgs/by-name & rename from xorg.xf86videonouveau
parent 6d88a228
Loading
Loading
Loading
Loading
+62 −0
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitLab,
  autoreconfHook,
  pkg-config,
  util-macros,
  xorg-server,
  xorgproto,
  libdrm,
  libpciaccess,
  udev,
  nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
  pname = "xf86-video-nouveau";
  version = "1.0.18";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    group = "xorg";
    owner = "driver";
    repo = "xf86-video-nouveau";
    tag = "xf86-video-nouveau-${finalAttrs.version}";
    hash = "sha256-gsrq32h0EKesivMoNbe1Thlc7FfubmS6zdwQmMxHsOk=";
  };

  strictDeps = true;

  nativeBuildInputs = [
    autoreconfHook
    pkg-config
    util-macros
    xorg-server # for some autoconf macros
  ];

  buildInputs = [
    xorg-server
    xorgproto
    libdrm
    libpciaccess
    udev
  ];

  passthru = {
    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-nouveau-(.*)" ]; };
  };

  meta = {
    description = "Xorg X server driver for NVIDIA video cards";
    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau";
    license = with lib.licenses; [
      mit
      hpndSellVariant
      # possibly unfree code according to the manpage in the repo
      # https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/merge_requests/17
      # unfree
    ];
    maintainers = [ ];
    platforms = lib.platforms.unix;
  };
})
+2 −42
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@
  xf86-input-void,
  xf86-video-ark,
  xf86-video-geode,
  xf86-video-nouveau,
  xfd,
  xfontsel,
  xfs,
@@ -346,6 +347,7 @@ self: with self; {
  xf86inputvoid = xf86-input-void;
  xf86videoark = xf86-video-ark;
  xf86videogeode = xf86-video-geode;
  xf86videonouveau = xf86-video-nouveau;
  xkeyboardconfig = xkeyboard-config;
  xorgcffiles = xorg-cf-files;
  xorgdocs = xorg-docs;
@@ -1084,48 +1086,6 @@ self: with self; {
    })
  ) { };

  # THIS IS A GENERATED FILE.  DO NOT EDIT!
  xf86videonouveau = callPackage (
    {
      stdenv,
      pkg-config,
      fetchurl,
      xorgproto,
      libdrm,
      udev,
      libpciaccess,
      xorgserver,
      testers,
    }:
    stdenv.mkDerivation (finalAttrs: {
      pname = "xf86-video-nouveau";
      version = "3ee7cbca8f9144a3bb5be7f71ce70558f548d268";
      builder = ./builder.sh;
      src = fetchurl {
        url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2";
        sha256 = "0rhs3z274jdzd82pcsl25xn8hmw6i4cxs2kwfnphpfhxbbkiq7wl";
      };
      hardeningDisable = [
        "bindnow"
        "relro"
      ];
      strictDeps = true;
      nativeBuildInputs = [ pkg-config ];
      buildInputs = [
        xorgproto
        libdrm
        udev
        libpciaccess
        xorgserver
      ];
      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
      meta = {
        pkgConfigModules = [ ];
        platforms = lib.platforms.unix;
      };
    })
  ) { };

  # THIS IS A GENERATED FILE.  DO NOT EDIT!
  xf86videonv = callPackage (
    {
+2 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ print OUT <<EOF;
  xf86-input-void,
  xf86-video-ark,
  xf86-video-geode,
  xf86-video-nouveau,
  xfd,
  xfontsel,
  xfs,
@@ -678,6 +679,7 @@ self: with self; {
  xf86inputvoid = xf86-input-void;
  xf86videoark = xf86-video-ark;
  xf86videogeode = xf86-video-geode;
  xf86videonouveau = xf86-video-nouveau;
  xkeyboardconfig = xkeyboard-config;
  xorgcffiles = xorg-cf-files;
  xorgdocs = xorg-docs;
+0 −10
Original line number Diff line number Diff line
@@ -146,16 +146,6 @@ self: super:
    configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ];
  });

  xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: {
    nativeBuildInputs = attrs.nativeBuildInputs ++ [
      autoreconfHook
      buildPackages.xorg.utilmacros # For xorg-utils.m4 macros
      buildPackages.xorg.xorgserver # For xorg-server.m4 macros
    ];
    # fixes `implicit declaration of function 'wfbScreenInit'; did you mean 'fbScreenInit'?
    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
  });

  xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: {
    meta = attrs.meta // {
      broken = isDarwin;
+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz
mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz
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.23.tar.xz
mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2