Author: viric
Date: Wed Mar 21 09:18:40 2012
New Revision: 33322
URL: https://nixos.org/websvn/nix/?rev=33322&sc=1

Log:
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

Modified:
   nixpkgs/trunk/pkgs/development/libraries/ti-rpc/default.nix
   nixpkgs/trunk/pkgs/os-specific/linux/nfs-utils/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/ti-rpc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ti-rpc/default.nix Wed Mar 21 
02:05:52 2012        (r33321)
+++ nixpkgs/trunk/pkgs/development/libraries/ti-rpc/default.nix Wed Mar 21 
09:18:40 2012        (r33322)
@@ -12,7 +12,7 @@
   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";

Modified: nixpkgs/trunk/pkgs/os-specific/linux/nfs-utils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/nfs-utils/default.nix  Wed Mar 21 
02:05:52 2012        (r33321)
+++ nixpkgs/trunk/pkgs/os-specific/linux/nfs-utils/default.nix  Wed Mar 21 
09:18:40 2012        (r33322)
@@ -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 @@
     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 =
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to