public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix a hard-coded reference in `shadow' to /usr/sbin/nscd. This

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2010-07-14 12:10:26 +00:00
parent cf37b58466
commit 7dd76e9ce5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/shadow/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pam }: { stdenv, fetchurl, pam, glibc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "shadow-4.1.4.2"; name = "shadow-4.1.4.2";
@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ pam ]; buildInputs = [ pam ];
patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ]; patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ];
preBuild =
''
substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
'';
meta = { meta = {
homepage = http://pkg-shadow.alioth.debian.org/; homepage = http://pkg-shadow.alioth.debian.org/;

2
pkgs/top-level/all-packages.nix
View File

@ -6921,7 +6921,7 @@ let
}; };
shadow = import ../os-specific/linux/shadow { shadow = import ../os-specific/linux/shadow {
inherit fetchurl stdenv pam; inherit fetchurl stdenv pam glibc;
}; };
splashutils = import ../os-specific/linux/splashutils/default.nix { splashutils = import ../os-specific/linux/splashutils/default.nix {