From d8c88a593b4fb2234672cc98a6e020901ce8d7be Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sun, 14 Dec 2025 03:22:49 +0100 Subject: [PATCH 1/5] xf86-video-ark: refactor, move to pkgs/by-name & rename from xorg.xf86videoark relevant changes: - switch to GitLab source instead of release tarball --- pkgs/by-name/xf/xf86-video-ark/package.nix | 53 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 6 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 57 insertions(+), 45 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-ark/package.nix diff --git a/pkgs/by-name/xf/xf86-video-ark/package.nix b/pkgs/by-name/xf/xf86-video-ark/package.nix new file mode 100644 index 000000000000..8b3d6db048c4 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-ark/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorg-server, + xorgproto, + libpciaccess, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-video-ark"; + version = "0.7.6"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-ark"; + tag = "xf86-video-ark-${finalAttrs.version}"; + hash = "sha256-IE35hEZVsfxjwrNxV/xtw8bdox9pwlO/Ra8vkcK19pM="; + }; + + 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-ark-(.*)" ]; }; + }; + + meta = { + description = "ARK Logic video driver for the Xorg X server"; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ark"; + license = lib.licenses.hpndSellVariant; + maintainers = [ ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.aarch64; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c450d989311e..3f202dc3db72 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -132,6 +132,7 @@ xf86-input-synaptics, xf86-input-vmmouse, xf86-input-void, + xf86-video-ark, xfd, xfontsel, xfs, @@ -342,6 +343,7 @@ self: with self; { xf86inputsynaptics = xf86-input-synaptics; xf86inputvmmouse = xf86-input-vmmouse; xf86inputvoid = xf86-input-void; + xf86videoark = xf86-video-ark; xkeyboardconfig = xkeyboard-config; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; @@ -622,44 +624,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoark = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libpciaccess, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-ark"; - version = "0.7.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz"; - sha256 = "0p88blr3zgy47jc4aqivc6ypj4zq9pad1cl70wwz9xig29w9xk2s"; - }; - 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! xf86videoast = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index a12a0f04a0aa..4d12e6b5f0b9 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -464,6 +464,7 @@ print OUT < Date: Sun, 14 Dec 2025 03:55:56 +0100 Subject: [PATCH 2/5] xf86-video-geode: refactor, move to pkgs/by-name & rename from xorg.xf86videogeode relevant changes: - switch to GitLab source instead of release tarball New license just dropped: Just put the third clause of BSD-3-Clause into the X11 license. I'm not gonna add this to spdx because geode is fucking old and probably deprecated in a few years anyway, maybe before Xorg. The package is not even listed on repology, despite being packaged in most distros. --- lib/licenses.nix | 5 ++ pkgs/by-name/xf/xf86-video-geode/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 6 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 6 files changed, 65 insertions(+), 45 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-geode/package.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index ce2e15951fc1..63fc954d50a6 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1542,6 +1542,11 @@ lib.mapAttrs mkLicense ( fullName = "X11 License"; }; + x11BsdClause = { + fullName = "X11 License with third BSD clause"; + url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/-/blob/d147c3f1b6907ae9db6f12853cedd450537d99d2/COPYING"; + }; + x11NoPermitPersons = { spdxId = "X11-no-permit-persons"; fullName = "X11 no permit persons clause"; diff --git a/pkgs/by-name/xf/xf86-video-geode/package.nix b/pkgs/by-name/xf/xf86-video-geode/package.nix new file mode 100644 index 000000000000..dba6eaf99ee3 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-geode/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-geode"; + version = "2.18.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-geode"; + tag = "xf86-video-geode-${finalAttrs.version}"; + hash = "sha256-y9fQpMg6qKjaQvDfqYbWscFomtzmHQ1cvzMaa4anhOE="; + }; + + 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-geode-(.*)" ]; }; + }; + + meta = { + description = "AMD Geode GX and LX graphics driver for the Xorg X server"; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode"; + license = with lib.licenses; [ + x11 + x11BsdClause + ]; + maintainers = [ ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.aarch64; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3f202dc3db72..de0b8fd1a972 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -133,6 +133,7 @@ xf86-input-vmmouse, xf86-input-void, xf86-video-ark, + xf86-video-geode, xfd, xfontsel, xfs, @@ -344,6 +345,7 @@ self: with self; { xf86inputvmmouse = xf86-input-vmmouse; xf86inputvoid = xf86-input-void; xf86videoark = xf86-video-ark; + xf86videogeode = xf86-video-geode; xkeyboardconfig = xkeyboard-config; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; @@ -858,44 +860,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videogeode = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libpciaccess, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-geode"; - version = "2.18.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz"; - sha256 = "0a8c6g3ndzf76rrrm3dwzmndcdy4y2qfai4324sdkmi8k9szicjr"; - }; - 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! xf86videoi128 = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 4d12e6b5f0b9..318650fff725 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -465,6 +465,7 @@ print OUT < Date: Sun, 14 Dec 2025 04:38:37 +0100 Subject: [PATCH 3/5] xf86-video-nouveau: 3ee7cbc... -> 1.0.18, refactor, move to pkgs/by-name & rename from xorg.xf86videonouveau --- .../by-name/xf/xf86-video-nouveau/package.nix | 62 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 44 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 10 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 66 insertions(+), 53 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-nouveau/package.nix diff --git a/pkgs/by-name/xf/xf86-video-nouveau/package.nix b/pkgs/by-name/xf/xf86-video-nouveau/package.nix new file mode 100644 index 000000000000..7763c58ed1bb --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-nouveau/package.nix @@ -0,0 +1,62 @@ +{ + 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; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index de0b8fd1a972..bec8cbc83b3f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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 ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 318650fff725..301bbef80990 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -466,6 +466,7 @@ print OUT < Date: Sun, 14 Dec 2025 04:54:05 +0100 Subject: [PATCH 4/5] xf86-video-s3virge: refactor, move to pkgs/by-name & rename from xorg.xf86videos3virge relevant changes: - switch to GitLab source instead of release tarball --- .../by-name/xf/xf86-video-s3virge/package.nix | 57 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 6 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 61 insertions(+), 45 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-s3virge/package.nix diff --git a/pkgs/by-name/xf/xf86-video-s3virge/package.nix b/pkgs/by-name/xf/xf86-video-s3virge/package.nix new file mode 100644 index 000000000000..c36de3ad4838 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-s3virge/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorg-server, + xorgproto, + libpciaccess, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-video-s3virge"; + version = "1.11.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-s3virge"; + tag = "xf86-video-s3virge-${finalAttrs.version}"; + hash = "sha256-UxAzsevKIMA3p6Q5cKjRPOku4cfbXiLmcJQWNEjpu7s="; + }; + + 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-s3virge-(.*)" ]; }; + }; + + meta = { + description = "S3 ViRGE video driver for the Xorg X server"; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3virge"; + license = with lib.licenses; [ + x11 + free # unknown free license TODO add to spdx + mit + ]; + maintainers = [ ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.aarch64; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bec8cbc83b3f..e7a7357ab29b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -135,6 +135,7 @@ xf86-video-ark, xf86-video-geode, xf86-video-nouveau, + xf86-video-s3virge, xfd, xfontsel, xfs, @@ -348,6 +349,7 @@ self: with self; { xf86videoark = xf86-video-ark; xf86videogeode = xf86-video-geode; xf86videonouveau = xf86-video-nouveau; + xf86videos3virge = xf86-video-s3virge; xkeyboardconfig = xkeyboard-config; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; @@ -1292,44 +1294,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videos3virge = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libpciaccess, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-s3virge"; - version = "1.11.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz"; - sha256 = "1qzfcq3rlpfdb6qxz8hrp9py1q11vyzl4iqxip1vpgfnfn83vl6f"; - }; - 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! xf86videosavage = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 301bbef80990..a7aa264a8e2f 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -467,6 +467,7 @@ print OUT < Date: Sun, 14 Dec 2025 05:07:11 +0100 Subject: [PATCH 5/5] xf86-video-v4l: refactor, move to pkgs/by-name & rename from xorg.xf86videov4l relevant changes: - switch to GitLab source instead of release tarball --- pkgs/by-name/xf/xf86-video-v4l/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 6 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 60 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-v4l/package.nix diff --git a/pkgs/by-name/xf/xf86-video-v4l/package.nix b/pkgs/by-name/xf/xf86-video-v4l/package.nix new file mode 100644 index 000000000000..aeb2813eea2d --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-v4l/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorg-server, + xorgproto, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-video-v4l"; + version = "0.3.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-v4l"; + tag = "xf86-video-v4l-${finalAttrs.version}"; + hash = "sha256-uCKeecAqHycYduKaDVMupGvMN84vHeF3ECyVchkXwdA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + xorg-server # for some autoconf macros + ]; + + buildInputs = [ + xorg-server + xorgproto + ]; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-v4l-(.*)" ]; }; + }; + + meta = { + description = "Video 4 Linux adaptor driver for the Xorg X server"; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-v4l"; + license = with lib.licenses; [ + # MIT AND X11 AND (GPL-2.0-or-later OR BSD-3-Clause) + mit + x11 + gpl2Plus + bsd3 + ]; + maintainers = [ ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e7a7357ab29b..9923fae3d974 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -136,6 +136,7 @@ xf86-video-geode, xf86-video-nouveau, xf86-video-s3virge, + xf86-video-v4l, xfd, xfontsel, xfs, @@ -350,6 +351,7 @@ self: with self; { xf86videogeode = xf86-video-geode; xf86videonouveau = xf86-video-nouveau; xf86videos3virge = xf86-video-s3virge; + xf86videov4l = xf86-video-v4l; xkeyboardconfig = xkeyboard-config; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; @@ -1636,42 +1638,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videov4l = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-v4l"; - version = "0.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; - sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videovboxvideo = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index a7aa264a8e2f..aeb72a556c36 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -468,6 +468,7 @@ print OUT <