diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-08-04 22:58:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 22:58:43 +0200 |
| commit | fef0331b1add4741ee60ada0dcfed9990cde157c (patch) | |
| tree | 5d334dc1c2c50e9f2407e09060e1463b8f99412f /pkgs/servers/x11 | |
| parent | 091f18e07b7ce2d8523ee580a1252c2ae93e5553 (diff) | |
| parent | a51c130827581ce711081b3ca59fde16f33bac1d (diff) | |
Merge pull request #132489 from TredwellGit/xorg.xwd
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a17b10bbfe819..9ea12d815886a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3312,11 +3312,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { pname = "xwd"; - version = "1.0.7"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; - sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; + url = "mirror://xorg/individual/app/xwd-1.0.8.tar.bz2"; + sha256 = "06q36fh55r62ms0igfxsanrn6gv8lh794q1bw9xzw51p2qs2papv"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a52e1a7b0a58f..ec43ae9d59d44 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -844,10 +844,6 @@ self: super: postInstall = "mkdir $out/bin"; }); - xwd = super.xwd.overrideAttrs (attrs: { - buildInputs = with self; attrs.buildInputs ++ [libXt]; - }); - xrdb = super.xrdb.overrideAttrs (attrs: { configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 10caa7093cd2c..dabfbd8811060 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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/xtrap-1.0.3.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/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 |