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

changes some targetPlatform to hostPlatform checks

Browse Source
This commit is contained in:
Will Dietz 2018-01-12 16:18:55 -06:00
parent 158c3c4864
commit 4aca016313
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/attr/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext, targetPlatform }: { stdenv, fetchurl, gettext, hostPlatform }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "attr-2.4.47"; name = "attr-2.4.47";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installTargets = "install install-lib install-dev"; installTargets = "install install-lib install-dev";
patches = if (targetPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null; patches = if (hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null;
meta = { meta = {
homepage = http://savannah.nongnu.org/projects/attr/; homepage = http://savannah.nongnu.org/projects/attr/;

4
pkgs/development/libraries/boehm-gc/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
separateDebugInfo = stdenv.isLinux; separateDebugInfo = stdenv.isLinux;
preConfigure = stdenv.lib.optionalString (stdenv.cc.libc == "musl") '' preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
''; '';
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
[ "--enable-cplusplus" ] [ "--enable-cplusplus" ]
++ lib.optional enableLargeConfig "--enable-large-config" ++ lib.optional enableLargeConfig "--enable-large-config"
++ lib.optional (stdenv.cc.libc == "musl") "--disable-static"; ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
doCheck = true; # not cross; doCheck = true; # not cross;

6
pkgs/os-specific/linux/pam/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPackages, targetPlatform, fetchurl, fetchpatch, flex, cracklib }: { stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "linux-pam-${version}"; name = "linux-pam-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4"; sha256 = "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4";
}; };
patches = stdenv.lib.optionals (targetPlatform.libc == "musl") [ patches = stdenv.lib.optionals (hostPlatform.libc == "musl") [
(fetchpatch { (fetchpatch {
url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf";
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
configureFlags="$configureFlags --includedir=$out/include/security" configureFlags="$configureFlags --includedir=$out/include/security"
'' + stdenv.lib.optionalString (targetPlatform.libc == "musl") '' '' + stdenv.lib.optionalString (hostPlatform.libc == "musl") ''
# export ac_cv_search_crypt=no # export ac_cv_search_crypt=no
# (taken from Alpine linux, apparently insecure but also doesn't build O:)) # (taken from Alpine linux, apparently insecure but also doesn't build O:))
# disable insecure modules # disable insecure modules