public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg.libXpm: 3.5.12 -> 3.5.13

Browse Source 
Don't set `src` in override (?!), or name.
This commit is contained in:
Will Dietz 2020-01-06 17:05:41 -06:00
parent 4a91444aa8
commit 2124eeca9c
No known key found for this signature in database
GPG Key ID: EBB0EA4124809D02
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -950,11 +950,11 @@ lib.makeScope newScope (self: with self; {
}) {}; }) {};
libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { 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; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; url = mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2;
sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw";
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig gettext ]; nativeBuildInputs = [ pkgconfig gettext ];

5
pkgs/servers/x11/xorg/overrides.nix
View File

@ -261,11 +261,6 @@ self: super:
}); });
libXpm = super.libXpm.overrideAttrs (attrs: { 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 outputs = [ "bin" "dev" "out" ]; # tiny man in $bin
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
}); });

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

@ -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/libxkbfile-1.1.0.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.3.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/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/libXpresent-1.0.0.tar.bz2
mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2
mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2