Author: eelco
Date: Wed Jul 14 12:10:26 2010
New Revision: 22599
URL: https://svn.nixos.org/websvn/nix/?rev=22599&sc=1
Log:
* Fix a hard-coded reference in `shadow' to /usr/sbin/nscd. This
prevented the nscd cache from being properly invalidated after a
change, so that e.g. `useradd x; id x' would fail.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/shadow/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/shadow/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/shadow/default.nix Wed Jul 14
10:55:45 2010 (r22598)
+++ nixpkgs/trunk/pkgs/os-specific/linux/shadow/default.nix Wed Jul 14
12:10:26 2010 (r22599)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam }:
+{ stdenv, fetchurl, pam, glibc }:
stdenv.mkDerivation rec {
name = "shadow-4.1.4.2";
@@ -11,6 +11,11 @@
buildInputs = [ pam ];
patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ];
+
+ preBuild =
+ ''
+ substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
+ '';
meta = {
homepage = http://pkg-shadow.alioth.debian.org/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jul 14 10:55:45
2010 (r22598)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jul 14 12:10:26
2010 (r22599)
@@ -6921,7 +6921,7 @@
};
shadow = import ../os-specific/linux/shadow {
- inherit fetchurl stdenv pam;
+ inherit fetchurl stdenv pam glibc;
};
splashutils = import ../os-specific/linux/splashutils/default.nix {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
