diff options
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/nbd/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/tgt/default.nix | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index d302e6250950e..e0679c089bcd6 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests }: +{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders }: stdenv.mkDerivation rec { pname = "nbd"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-aHcVbSOnsz917uidL1wskcVCr8PNy2Nt6lqIU5pY0Qw="; }; - buildInputs = [ glib ] - ++ lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; + buildInputs = [ glib linuxHeaders ]; nativeBuildInputs = [ pkg-config which bison ]; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 34f0936876054..7e57c8f490113 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl +{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, glibc , docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux }: @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's|/usr/bin/||' doc/Makefile sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile - sed -i 's|/usr/include/sys/|${stdenv.glibc.dev}/include/sys/|' usr/Makefile - sed -i 's|/usr/include/linux/|${stdenv.glibc.dev}/include/linux/|' usr/Makefile + sed -i 's|/usr/include/sys/|${glibc.dev}/include/sys/|' usr/Makefile + sed -i 's|/usr/include/linux/|${glibc.dev}/include/linux/|' usr/Makefile ''; postInstall = '' |