summary refs log tree commit diff
path: root/pkgs/development/libraries/cairo
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-04-06 18:59:30 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-04-12 11:53:47 +0200
commitb9219912de7ea94e7d420f3846d56a79f67be373 (patch)
treeb6cc002822968becab23aa86c5b69589cffaa393 /pkgs/development/libraries/cairo
parente8f0cb9272d3b4e698f3200b3abf2f4d54e295d0 (diff)
downloadnixpkgs-b9219912de7ea94e7d420f3846d56a79f67be373.tar
nixpkgs-b9219912de7ea94e7d420f3846d56a79f67be373.tar.gz
nixpkgs-b9219912de7ea94e7d420f3846d56a79f67be373.tar.bz2
nixpkgs-b9219912de7ea94e7d420f3846d56a79f67be373.tar.lz
nixpkgs-b9219912de7ea94e7d420f3846d56a79f67be373.tar.xz
nixpkgs-b9219912de7ea94e7d420f3846d56a79f67be373.tar.zst
nixpkgs-b9219912de7ea94e7d420f3846d56a79f67be373.zip
cairo: 1.14.10 → 1.15.10
Diffstat (limited to 'pkgs/development/libraries/cairo')
-rw-r--r--pkgs/development/libraries/cairo/default.nix22
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 6a7beb1cc1a..6d7b79c0b20 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,25 +9,17 @@
 
 assert glSupport -> libGL != null;
 
-let inherit (stdenv.lib) optional optionals; in
-
-stdenv.mkDerivation rec {
-  name = "cairo-1.14.10";
+let
+  version = "1.15.10";
+  inherit (stdenv.lib) optional optionals;
+in stdenv.mkDerivation rec {
+  name = "cairo-${version}";
 
   src = fetchurl {
-    url = "http://cairographics.org/releases/${name}.tar.xz";
-    sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy";
+    url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+    sha256 = "14l3jll98pjdlpm8f972v0spzcsf6y5nz85y2k8iybyg6ihj5jk2";
   };
 
-  patches = [
-    # from https://bugs.freedesktop.org/show_bug.cgi?id=98165
-    (fetchpatch {
-      name = "cairo-CVE-2016-9082.patch";
-      url = "https://bugs.freedesktop.org/attachment.cgi?id=127421";
-      sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri";
-    })
-  ];
-
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev"; # very small