public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging 

A couple fixes were pushed directly to staging-next.
This commit is contained in:
Vladimír Čunát 2018-08-10 18:44:36 +02:00
parent b1caaecc8c 7b3036a4a2
commit 1cec3d8aaa
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gdbm/default.nix
View File

@ -2,6 +2,8 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gdbm-1.17"; 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 { src = fetchurl {
url = "mirror://gnu/gdbm/${name}.tar.gz"; url = "mirror://gnu/gdbm/${name}.tar.gz";

2
pkgs/development/libraries/libtiff/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
prePatch = let prePatch = let
debian = fetchurl { 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; url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz;
sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f"; sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f";
}; };

2
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
"--disable-use-tty-group" "--disable-use-tty-group"
"--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin" "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin"
"--disable-makeinstall-setuid" "--disable-makeinstall-chown" "--disable-makeinstall-setuid" "--disable-makeinstall-chown"
(lib.withFeature (ncurses != null) "ncurses") (lib.withFeature (ncurses != null) "ncursesw")
(lib.withFeature (systemd != null) "systemd") (lib.withFeature (systemd != null) "systemd")
(lib.withFeatureAs (systemd != null) (lib.withFeatureAs (systemd != null)
"systemdsystemunitdir" "$bin/lib/systemd/system/") "systemdsystemunitdir" "$bin/lib/systemd/system/")