diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-12 16:18:55 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:42 -0600 |
| commit | 4aca016313e08370757ac33dd15e15afe986ea13 (patch) | |
| tree | 6417f45e03d6cdc42d776ba1e2c6173df29c3bf3 | |
| parent | 158c3c4864b55911e8be7db9c4b558c1a6dee207 (diff) | |
| download | nixpkgs-4aca016313e08370757ac33dd15e15afe986ea13.tar nixpkgs-4aca016313e08370757ac33dd15e15afe986ea13.tar.gz nixpkgs-4aca016313e08370757ac33dd15e15afe986ea13.tar.bz2 nixpkgs-4aca016313e08370757ac33dd15e15afe986ea13.tar.lz nixpkgs-4aca016313e08370757ac33dd15e15afe986ea13.tar.xz nixpkgs-4aca016313e08370757ac33dd15e15afe986ea13.tar.zst nixpkgs-4aca016313e08370757ac33dd15e15afe986ea13.zip | |
changes some targetPlatform to hostPlatform checks
| -rw-r--r-- | pkgs/development/libraries/attr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/boehm-gc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 05d9b842e65..34bf9aca974 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, targetPlatform }: +{ stdenv, fetchurl, gettext, hostPlatform }: stdenv.mkDerivation rec { name = "attr-2.4.47"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 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 = { homepage = http://savannah.nongnu.org/projects/attr/; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 9efcf023a45..c1bcb46bae6 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; 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" ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cplusplus" ] ++ 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; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index d9fd164bbc0..fb33f9555e5 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, targetPlatform, fetchurl, fetchpatch, flex, cracklib }: +{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib }: stdenv.mkDerivation rec { name = "linux-pam-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4"; }; - patches = stdenv.lib.optionals (targetPlatform.libc == "musl") [ + patches = stdenv.lib.optionals (hostPlatform.libc == "musl") [ (fetchpatch { url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --includedir=$out/include/security" - '' + stdenv.lib.optionalString (targetPlatform.libc == "musl") '' + '' + stdenv.lib.optionalString (hostPlatform.libc == "musl") '' # export ac_cv_search_crypt=no # (taken from Alpine linux, apparently insecure but also doesn't build O:)) # disable insecure modules |