From 7dd76e9ce540c9700eee71ed2d4908eec1f252ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Jul 2010 12:10:26 +0000 Subject: * 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. svn path=/nixpkgs/trunk/; revision=22599 --- pkgs/os-specific/linux/shadow/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index dcaee64b03c..6c7f9083c72 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam }: +{ stdenv, fetchurl, pam, glibc }: stdenv.mkDerivation rec { name = "shadow-4.1.4.2"; @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { 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/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9db2354da31..13c218f45ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6921,7 +6921,7 @@ let }; shadow = import ../os-specific/linux/shadow { - inherit fetchurl stdenv pam; + inherit fetchurl stdenv pam glibc; }; splashutils = import ../os-specific/linux/splashutils/default.nix { -- cgit 1.4.1