From d35d7ca6f9d4b766570f4fe308395ca2a1f9915b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 9 Oct 2022 17:31:47 +0100 Subject: [PATCH] xorg.libXaw3d: remove in favour of Xaw3d Noticed this redundant attribute that no package uses. All packages use `Xaw3d`. Let's use that instead. --- pkgs/servers/x11/xorg/default.nix | 16 ---------------- pkgs/servers/x11/xorg/tarballs.list | 1 - 2 files changed, 17 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 77d68e1d9aa..6d57f881bea 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -935,22 +935,6 @@ lib.makeScope newScope (self: with self; { meta.platforms = lib.platforms.unix; }) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXaw3d = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { - pname = "libXaw3d"; - version = "1.6.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2"; - sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { pname = "libXcomposite"; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 302d56a0663..d0f8661e93e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -177,7 +177,6 @@ mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.8.1.tar.xz mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2 -mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/lib/libxcb-1.14.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2