diff options
| author | Will Dietz <w@wdtz.org> | 2020-01-06 17:05:41 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2020-01-06 17:40:23 -0600 |
| commit | 2124eeca9c20d6c87a209204e3f467d8a297759d (patch) | |
| tree | c4ea0d74b171dd5a6aad96d61846820a7ccd86d5 /pkgs/servers/x11 | |
| parent | 4a91444aa81c6c5b002facf453ff5fbc524177e1 (diff) | |
| download | nixpkgs-2124eeca9c20d6c87a209204e3f467d8a297759d.tar nixpkgs-2124eeca9c20d6c87a209204e3f467d8a297759d.tar.gz nixpkgs-2124eeca9c20d6c87a209204e3f467d8a297759d.tar.bz2 nixpkgs-2124eeca9c20d6c87a209204e3f467d8a297759d.tar.lz nixpkgs-2124eeca9c20d6c87a209204e3f467d8a297759d.tar.xz nixpkgs-2124eeca9c20d6c87a209204e3f467d8a297759d.tar.zst nixpkgs-2124eeca9c20d6c87a209204e3f467d8a297759d.zip | |
xorg.libXpm: 3.5.12 -> 3.5.13
Don't set `src` in override (?!), or name.
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 | 5 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f83d76a3c2b..432d715b70d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -950,11 +950,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { - name = "libXpm-3.5.12"; + name = "libXpm-3.5.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; - sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; + url = mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2; + sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c01bca007dc..7c82d2373d7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -261,11 +261,6 @@ self: super: }); libXpm = super.libXpm.overrideAttrs (attrs: { - name = "libXpm-3.5.12"; - src = fetchurl { - url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; - sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; - }; outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 2fcf09cd9fb..59d446d3a31 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -195,7 +195,7 @@ mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 -mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 +mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 |