From 5d294019c857aee8d977d3c6377254b44c19fb1d Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 10 Jan 2026 18:09:18 +0100 Subject: [PATCH] xf86-video-siliconmotion: refactor, move to pkgs/by-name & rename from xorg.xf86videosiliconmotion relevant changes: - switch to GitLab source instead of release tarball --- .../xf/xf86-video-siliconmotion/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 9 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 60 insertions(+), 48 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-siliconmotion/package.nix diff --git a/pkgs/by-name/xf/xf86-video-siliconmotion/package.nix b/pkgs/by-name/xf/xf86-video-siliconmotion/package.nix new file mode 100644 index 000000000000..ad3a3ac6d169 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-siliconmotion/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorg-server, + xorgproto, + libpciaccess, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-video-siliconmotion"; + version = "1.7.10"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-siliconmotion"; + tag = "xf86-video-siliconmotion-${finalAttrs.version}"; + hash = "sha256-CRuzdxlES6TFMDGIKk5sBAXF2Pa781jmTzlVT+A2Muk="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + xorg-server # for some autoconf macros + ]; + + buildInputs = [ + xorg-server + xorgproto + libpciaccess + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=xf86-video-siliconmotion-(.*)" ]; + }; + + meta = { + description = "Silicon Motion video driver for the Xorg X server"; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-siliconmotion"; + license = with lib.licenses; [ + x11 + mit + ]; + maintainers = [ ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isAarch64; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c701d554fb6e..d74d6419a765 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -158,6 +158,7 @@ xf86-video-r128, xf86-video-s3virge, xf86-video-savage, + xf86-video-siliconmotion, xf86-video-sis, xf86-video-sisusb, xf86-video-suncg6, @@ -411,6 +412,7 @@ self: with self; { xf86videor128 = xf86-video-r128; xf86videos3virge = xf86-video-s3virge; xf86videosavage = xf86-video-savage; + xf86videosiliconmotion = xf86-video-siliconmotion; xf86videosis = xf86-video-sis; xf86videosisusb = xf86-video-sisusb; xf86videosuncg6 = xf86-video-suncg6; @@ -474,44 +476,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosiliconmotion = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libpciaccess, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-siliconmotion"; - version = "1.7.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz"; - sha256 = "1h4g2mqxshaxii416ldw0aqy6cxnsbnzayfin51xm2526dw9q18n"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libpciaccess - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videotrident = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 5927b5d59a24..2d5079b541b7 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -490,6 +490,7 @@ print OUT <