diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-10 18:44:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-10 18:45:53 +0200 |
| commit | 1cec3d8aaa351c8d2f40b08fd53001ad7bc6a378 (patch) | |
| tree | 15b5e3457c203fff5a27f4310fe1f137fce2eae2 /pkgs/development | |
| parent | b1caaecc8ce5d5a639897a5f0f55dfcb77c04610 (diff) | |
| parent | 7b3036a4a2117378b199ab700c4ece2393a83df8 (diff) | |
| download | nixlib-1cec3d8aaa351c8d2f40b08fd53001ad7bc6a378.tar nixlib-1cec3d8aaa351c8d2f40b08fd53001ad7bc6a378.tar.gz nixlib-1cec3d8aaa351c8d2f40b08fd53001ad7bc6a378.tar.bz2 nixlib-1cec3d8aaa351c8d2f40b08fd53001ad7bc6a378.tar.lz nixlib-1cec3d8aaa351c8d2f40b08fd53001ad7bc6a378.tar.xz nixlib-1cec3d8aaa351c8d2f40b08fd53001ad7bc6a378.tar.zst nixlib-1cec3d8aaa351c8d2f40b08fd53001ad7bc6a378.zip | |
Merge branch 'staging-next' into staging
A couple fixes were pushed directly to staging-next.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/gdbm/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index ecab75fb0ea9..bbebcca6e2f0 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -2,6 +2,8 @@ stdenv.mkDerivation rec { name = "gdbm-1.17"; + # FIXME: remove on update to > 1.17 + NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index d37e93e6f82f..bf0393fd89a6 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { prePatch = let debian = fetchurl { + # When the URL disappears, it typically means that Debian has new patches + # (probably security) and updating to new tarball will apply them as well. url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz; sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f"; }; |