From 28027d477126190be8f7e855c816e735feac8f2f Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Wed, 21 Mar 2012 09:18:40 +0000 Subject: Aestethic changes suggested by Eelco, and trying to fix the problem on rpc.statd, that looks at /etc/netconfig. Problem: http://hydra.nixos.org/build/2310686/log/raw svn path=/nixpkgs/trunk/; revision=33322 --- pkgs/development/libraries/ti-rpc/default.nix | 2 +- pkgs/os-specific/linux/nfs-utils/default.nix | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index e26d714367fa..e3fd2bc34ff4 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "" > src/des_crypt.c - sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "doc/Makefile.in" + sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; preInstall = "mkdir -p $out/etc"; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index dfbc1b562095..0a0a3c997484 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent, libnfsidmap, lvm2, - e2fsprogs }: +{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent, libnfsidmap +, lvm2, e2fsprogs }: stdenv.mkDerivation rec { name = "nfs-utils-1.2.5"; @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m"; }; - buildInputs = [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap lvm2 - e2fsprogs ]; + buildInputs = + [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap + lvm2 e2fsprogs + ]; # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. configureFlags = -- cgit 1.4.1