cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #132489 from TredwellGit/xorg.xwd

Browse source
This commit is contained in:
Sandro 2021-08-04 22:58:43 +02:00 committed by GitHub
commit fef0331b1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3312,11 +3312,11 @@ lib.makeScope newScope (self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT! # THIS IS A GENERATED FILE. DO NOT EDIT!
xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation {
pname = "xwd"; pname = "xwd";
version = "1.0.7"; version = "1.0.8";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; url = "mirror://xorg/individual/app/xwd-1.0.8.tar.bz2";
sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; sha256 = "06q36fh55r62ms0igfxsanrn6gv8lh794q1bw9xzw51p2qs2papv";
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

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

@ -844,10 +844,6 @@ self: super:
postInstall = "mkdir $out/bin"; postInstall = "mkdir $out/bin";
}); });
xwd = super.xwd.overrideAttrs (attrs: {
buildInputs = with self; attrs.buildInputs ++ [libXt];
});
xrdb = super.xrdb.overrideAttrs (attrs: { xrdb = super.xrdb.overrideAttrs (attrs: {
configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ];
}); });

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

@ -70,7 +70,7 @@ mirror://xorg/individual/app/xsm-1.0.4.tar.bz2
mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2 mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2
mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2
mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwd-1.0.8.tar.bz2
mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2
mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2
mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2