b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208900 from Artturin/xorgwrapWithXFileSearchPathHook

Browse source
This commit is contained in:
Artturi 2023-01-04 16:52:48 +02:00 committed by GitHub
parent 627bec113e c42e7b71d2
commit 5ce27e15ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 78 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
pkgs/servers/x11/xorg/default.nix
View file

@ -38,7 +38,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "bitmap";
version = "1.0.9";
builder = ./builder.sh;
@ -48,13 +48,13 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ];
meta.platforms = lib.platforms.unix;
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "editres";
version = "1.0.7";
builder = ./builder.sh;
@ -64,7 +64,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -1578,7 +1578,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation {
oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "oclock";
version = "1.0.4";
builder = ./builder.sh;
@ -1588,7 +1588,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libxkbfile libX11 libXext libXmu libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -1690,7 +1690,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation {
viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "viewres";
version = "1.0.5";
builder = ./builder.sh;
@ -1700,7 +1700,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libXaw libXmu libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -1724,11 +1724,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation {
pname = "xauth";
version = "1.1";
version = "1.1.2";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2";
sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd";
url = "mirror://xorg/individual/app/xauth-1.1.2.tar.xz";
sha256 = "0072ivzn4z59ysanz838nh8s4mcmdsx6q9xkvlfysv2k37ynmfkq";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@ -1770,7 +1770,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation {
xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xcalc";
version = "1.1.0";
builder = ./builder.sh;
@ -1780,7 +1780,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXaw xorgproto libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -1914,7 +1914,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xclock";
version = "1.0.9";
builder = ./builder.sh;
@ -1924,7 +1924,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -1962,7 +1962,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xconsole";
version = "1.0.7";
builder = ./builder.sh;
@ -1972,7 +1972,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -2010,7 +2010,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xdm";
version = "1.1.12";
builder = ./builder.sh;
@ -2020,7 +2020,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -2460,11 +2460,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
pname = "xf86-video-mga";
version = "2.0.0";
version = "2.0.1";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2";
sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296";
url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz";
sha256 = "1aq3aqh2yg09gy864kkshfx5pjl5w05jdz97bx5bnrbrhdq3p8r7";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@ -2588,11 +2588,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
pname = "xf86-video-r128";
version = "6.11.0";
version = "6.12.1";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2";
sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav";
url = "mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz";
sha256 = "0hf7h54wxgs8njavp0kgadjq1787fhbd588j7pj685hz2wmkq0kx";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@ -2906,7 +2906,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation {
xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xfd";
version = "1.1.3";
builder = ./builder.sh;
@ -2916,13 +2916,13 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config gettext ];
nativeBuildInputs = [ pkg-config gettext wrapWithXFileSearchPathHook ];
buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ];
meta.platforms = lib.platforms.unix;
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xfontsel";
version = "1.0.6";
builder = ./builder.sh;
@ -2932,7 +2932,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXaw libXmu libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -2986,7 +2986,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xgc";
version = "1.0.5";
builder = ./builder.sh;
@ -2996,7 +2996,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libXaw libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -3146,7 +3146,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation {
xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xload";
version = "1.1.3";
builder = ./builder.sh;
@ -3156,7 +3156,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config gettext ];
nativeBuildInputs = [ pkg-config gettext wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -3210,7 +3210,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xmag";
version = "1.0.6";
builder = ./builder.sh;
@ -3220,13 +3220,13 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libX11 libXaw libXmu libXt ];
meta.platforms = lib.platforms.unix;
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xmessage";
version = "1.0.5";
builder = ./builder.sh;
@ -3236,7 +3236,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libXaw libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -3258,7 +3258,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xmore";
version = "1.0.3";
builder = ./builder.sh;
@ -3268,7 +3268,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libXaw libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -3466,7 +3466,7 @@ self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation {
xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
pname = "xsm";
version = "1.0.4";
builder = ./builder.sh;
@ -3476,7 +3476,7 @@ self: with self; {
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
buildInputs = [ libICE libSM libX11 libXaw libXt ];
meta.platforms = lib.platforms.unix;
}) {};

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

@ -23,7 +23,7 @@ my %pcMap;
my %extraAttrs;
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext", "meson", "ninja" );
my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext", "meson", "ninja", "wrapWithXFileSearchPathHook" );
$pcMap{$_} = $_ foreach @missingPCs;
$pcMap{"freetype2"} = "freetype";
$pcMap{"libpng12"} = "libpng";
@ -195,6 +195,10 @@ while (<>) {
push @{$extraAttrs{$pkg}}, "postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`\$PKG_CONFIG' '';";
}
if (@@ = glob("$tmpDir/*/app-defaults/")) {
push @nativeRequires, "wrapWithXFileSearchPathHook";
}
sub process {
my $requires = shift;
my $s = shift;

66
pkgs/servers/x11/xorg/overrides.nix
View file

@ -1,6 +1,7 @@
{ abiCompat ? null,
callPackage,
lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
automake, autoconf, gettext, libiconv, libtool, intltool,
automake, autoconf, libiconv, libtool, intltool,
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
@ -22,25 +23,28 @@ let
in
self: super:
{
wrapWithXFileSearchPathHook = callPackage ({ makeBinaryWrapper, makeSetupHook, writeScript }: makeSetupHook {
name = "wrapWithXFileSearchPathHook";
deps = [ makeBinaryWrapper ];
} (writeScript "wrapWithXFileSearchPathHook.sh" ''
wrapWithXFileSearchPath() {
paths=(
"$out/share/X11/%T/%N"
"$out/include/X11/%T/%N"
"${xorg.xbitmaps}/include/X11/%T/%N"
)
for exe in $out/bin/*; do
wrapProgram "$exe" \
--suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
done
}
postInstallHooks+=(wrapWithXFileSearchPath)
'')) {};
bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ];
});
bitmap = super.bitmap.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
postInstall = ''
paths=(
"$out/share/X11/%T/%N"
"$out/include/X11/%T/%N"
"${xorg.xbitmaps}/include/X11/%T/%N"
)
wrapProgram "$out/bin/bitmap" \
--suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
makeWrapper "$out/bin/bitmap" "$out/bin/bitmap-color" \
--suffix XFILESEARCHPATH : "$out/share/X11/%T/%N-color"
'';
});
editres = super.editres.overrideAttrs (attrs: {
hardeningDisable = [ "format" ];
});
@ -140,6 +144,14 @@ self: super:
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
});
libFS = super.libFS.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
});
libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
});
xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
@ -312,11 +324,6 @@ self: super:
});
libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
name = "libxshmfence-1.3";
src = fetchurl {
url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2";
sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q";
};
outputs = [ "out" "dev" ]; # mainly to avoid propagation
});
@ -705,10 +712,6 @@ self: super:
postPatch = with lib; concatStrings (mapAttrsToList patchIn layouts);
});
xload = super.xload.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ gettext ];
});
xlsfonts = super.xlsfonts.overrideAttrs (attrs: {
meta = attrs.meta // { license = lib.licenses.mit; };
});
@ -1023,7 +1026,7 @@ self: super:
rev = "31486f40f8e8f8923ca0799aea84b58799754564";
sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM=";
};
buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXfixes xorg.libXv xorg.pixman xorg.utilmacros ];
buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXv xorg.pixman xorg.utilmacros ];
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ];
configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
@ -1098,17 +1101,6 @@ self: super:
'';
});
xcalc = super.xcalc.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or [] ++ [
"--with-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
];
nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/xcalc \
--set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults
'';
});
# convert Type1 vector fonts to OpenType fonts
fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ];

6
pkgs/servers/x11/xorg/tarballs.list
View file

@ -24,7 +24,7 @@ mirror://xorg/individual/app/transset-1.0.2.tar.bz2
mirror://xorg/individual/app/twm-1.0.10.tar.bz2
mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
mirror://xorg/individual/app/xauth-1.1.tar.bz2
mirror://xorg/individual/app/xauth-1.1.2.tar.xz
mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2
mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
mirror://xorg/individual/app/xclock-1.0.9.tar.bz2
@ -101,7 +101,7 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2
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.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz
mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2
https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2
@ -109,7 +109,7 @@ 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
mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz
mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2