ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 14:19:58 +03:00
Code Issues Projects Releases Wiki Activity

xorg.libpciaccess: 0.17 -> 0.18

Browse Source
This commit is contained in:
Nick Cao 2024-02-11 11:38:09 -05:00
parent a6566657e3
commit d8d6198b71
No known key found for this signature in database
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/servers/x11/xorg/default.nix
View File

@ -1756,19 +1756,18 @@ self: with self; {
})) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, hwdata, zlib, testers }: stdenv.mkDerivation (finalAttrs: {
libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "libpciaccess";
version = "0.17";
version = "0.18";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libpciaccess-0.17.tar.xz";
sha256 = "0wsvv5d05maqbidvnavka7n0fnql55m4jix5wwlk14blr6ikna3l";
url = "mirror://xorg/individual/lib/libpciaccess-0.18.tar.xz";
sha256 = "1ab2qbksf15jrpzd6x9ncri64d2bnhlw7aajdws58lj9gljv0qal";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ hwdata zlib ];
configureFlags = [ "--with-pciids-path=${hwdata}/share/hwdata" ];
buildInputs = [ ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "pciaccess" ];

6
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -198,12 +198,6 @@ while (<>) {
push @{$extraAttrs{$pkg}}, "postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`\$PKG_CONFIG' '';";
}
# libpciaccess requires pci.ids{,.gz} at runtime
if ($pkg eq "libpciaccess") {
push @requires, "hwdata";
push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-pciids-path=\${hwdata}/share/hwdata\" ];";
}
if (@@ = glob("$tmpDir/*/app-defaults/")) {
push @nativeRequires, "wrapWithXFileSearchPathHook";
}

17
pkgs/servers/x11/xorg/overrides.nix
View File

@ -5,7 +5,7 @@
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd,
ncompress,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt,
mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, hwdata,
ApplicationServices, Carbon, Cocoa, Xplugin,
xorg, windows
}:
@ -408,14 +408,15 @@ self: super:
});
libpciaccess = super.libpciaccess.overrideAttrs (attrs: {
patches = attrs.patches or [] ++ [
(fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/833c86ce15cee2a84a37ae71015f236fd32615d9.patch";
hash = "sha256-6koQV+Vse7/OWwuWYrWmBUebHBT+5F32Kkn9V9j+m+Q=";
})
];
nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ];
buildInputs = lib.optionals stdenv.hostPlatform.isNetBSD (with netbsd; [ libarch libpci ]);
buildInputs = attrs.buildInputs ++ [ zlib ]
++ lib.optionals stdenv.hostPlatform.isNetBSD (with netbsd; [ libarch libpci ]);
mesonFlags = [
(lib.mesonOption "pci-ids" "${hwdata}/share/hwdata")
(lib.mesonEnable "zlib" true)
];
meta = attrs.meta // {
# https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/blob/master/configure.ac#L108-114

2
pkgs/servers/x11/xorg/tarballs.list
View File

@ -171,7 +171,7 @@ mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz
mirror://xorg/individual/lib/libfontenc-1.1.7.tar.xz
mirror://xorg/individual/lib/libFS-1.0.9.tar.xz
mirror://xorg/individual/lib/libICE-1.1.1.tar.xz
mirror://xorg/individual/lib/libpciaccess-0.17.tar.xz
mirror://xorg/individual/lib/libpciaccess-0.18.tar.xz
mirror://xorg/individual/lib/libSM-1.2.4.tar.xz
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.8.7.tar.xz