movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

xdg-utils: update from git to fix CVE-2014-9622

Browse source 
Fixes #6193.
Disabling docs generation might be another alternative
to the build-time dependency blowup.

(cherry picked from commit 346c8d7a98)

Conflicts (simple):
	pkgs/tools/X11/xdg-utils/default.nix
This commit is contained in:
Vladimír Čunát 2015-02-07 07:30:05 +01:00
parent 592b4f7a3e
commit d16b0e3ae5
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pkgs/tools/X11/xdg-utils/default.nix
View file

@ -1,13 +1,17 @@
{ stdenv, fetchurl, file }:
{ stdenv, fetchgit, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto, w3m }:
stdenv.mkDerivation rec {
name = "xdg-utils-1.1.0-rc1";
name = "xdg-utils-1.1.0-rc3p7";
src = fetchurl {
url = "http://portland.freedesktop.org/download/${name}.tar.gz";
sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv";
src = fetchgit {
url = "git://anongit.freedesktop.org/xdg/xdg-utils";
rev = "e8ee3b18d16e41b95148111b920a0c8beed3ac6c";
sha256 = "0qy9h7vh6sw7wmadjvasw4sdhb9fvv7bn32ifgasdx7ag3r3939w";
};
# just needed when built from git
buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ];
postInstall = ''
substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file
'';
@ -20,3 +24,4 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
};
}