diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-02-07 07:30:05 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-02-07 07:35:21 +0100 |
| commit | 346c8d7a989c19d4186aa5b7c8e685cd0807f5d0 (patch) | |
| tree | fd1e5efef6c87942c91f181185bef265b9e5b28c /pkgs/tools/X11/xdg-utils/default.nix | |
| parent | 098ed10f3902ff2f4050f4d5010bfd4008665fa2 (diff) | |
| download | nixpkgs-346c8d7a989c19d4186aa5b7c8e685cd0807f5d0.tar nixpkgs-346c8d7a989c19d4186aa5b7c8e685cd0807f5d0.tar.gz nixpkgs-346c8d7a989c19d4186aa5b7c8e685cd0807f5d0.tar.bz2 nixpkgs-346c8d7a989c19d4186aa5b7c8e685cd0807f5d0.tar.lz nixpkgs-346c8d7a989c19d4186aa5b7c8e685cd0807f5d0.tar.xz nixpkgs-346c8d7a989c19d4186aa5b7c8e685cd0807f5d0.tar.zst nixpkgs-346c8d7a989c19d4186aa5b7c8e685cd0807f5d0.zip | |
xdg-utils: update from git to fix CVE-2014-9622
Fixes #6193. Disabling docs generation might be another alternative to the build-time dependency blowup. That KDE patch no longer applies, but the code seems to take KDE5 into account already. CC @ttuegel.
Diffstat (limited to 'pkgs/tools/X11/xdg-utils/default.nix')
| -rw-r--r-- | pkgs/tools/X11/xdg-utils/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 3e4615609e0..8434e651dbe 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,14 +1,16 @@ -{ 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"; }; - patches = [ ./0001-xdg-open-recognize-KDE_SESSION_VERSION.patch ]; + # 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 @@ -22,3 +24,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } + |