diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:30:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:30:19 +0200 |
| commit | 1dc36904d8cefa8188c785efd03274637c838e31 (patch) | |
| tree | 0cf37f0803f1e9c6985d09f2870e5ec61229d2ca /pkgs/development/libraries/libxslt/default.nix | |
| parent | 75f1cc61b86b002f551529f1cafa30b4f4010bd9 (diff) | |
| parent | 7a005601d48f760864258e369364b3b847d4e9fd (diff) | |
| download | nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.gz nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.bz2 nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.lz nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.xz nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.zst nixlib-1dc36904d8cefa8188c785efd03274637c838e31.zip | |
Merge #14920: windows improvements, mainly mingw
Diffstat (limited to 'pkgs/development/libraries/libxslt/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 0eda42879ece..c76f28246047 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { }; patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch + ++ stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") + (fetchpatch { + name = "mingw.patch"; + url = "http://git.gnome.org/browse/libxslt/patch/?id=ab5810bf27cd63"; + sha256 = "0kkqq3fv2k3q86al38vp6zwxazpvp5kslcjnmrq4ax5cm2zvsjk3"; + }) ++ [ (fetchpatch { name = "CVE-2015-7995.patch"; |