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

treewide: Remove usage of remaining redundant platform compatability stuff

Browse Source 
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
This commit is contained in:
John Ericson
2018-08-30 17:20:32 -04:00
parent 2c2f1e37d4
commit 0828e2d8c3
149 changed files with 545 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/shadow/default.nix
+4 -5
View File
@@ -1,15 +1,14 @@
{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2
, docbook_xml_dtd_412, docbook_xsl, gnome-doc-utils, flex, bison
, pam ? null, glibcCross ? null
, buildPlatform, hostPlatform
}:
let
glibc =
if hostPlatform != buildPlatform
if stdenv.hostPlatform != stdenv.buildPlatform
then glibcCross
else assert hostPlatform.libc == "glibc"; stdenv.cc.libc;
else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc;
dots_in_usernames = fetchpatch {
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch;
@@ -63,9 +62,9 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-man"
"--with-group-name-max-length=32"
] ++ stdenv.lib.optional (hostPlatform.libc != "glibc") "--disable-nscd";
] ++ stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd";
preBuild = stdenv.lib.optionalString (hostPlatform.libc == "glibc")
preBuild = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc")
''
substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
'';