about summary refs log tree commit diff
path: root/pkgs/stdenv/darwin
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-09-01 17:37:53 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-09-01 17:38:18 +0200
commit2d6179d1e8c15d341f0cade0ab55653623eb5038 (patch)
treed69260a6e740c174c9616b2bb6d24a0e98ba8f6e /pkgs/stdenv/darwin
parent2e7cb61cfbe6df23a2e223f98ae61e1a385ea747 (diff)
parent9a56eee0b144c1e63afc0b5c9e562da9565ea7f0 (diff)
downloadnixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar
nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.gz
nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.bz2
nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.lz
nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.xz
nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.zst
nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.zip
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
Diffstat (limited to 'pkgs/stdenv/darwin')
-rw-r--r--pkgs/stdenv/darwin/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 3dcb37773959..6d224e4cc44f 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -347,10 +347,10 @@ in rec {
 
       darwin = super.darwin // {
         inherit (darwin) dyld ICU Libsystem libiconv;
-      } // lib.optionalAttrs (super.targetPlatform == localSystem) {
+      } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
         inherit (darwin) binutils binutils-unwrapped cctools;
       };
-    } // lib.optionalAttrs (super.targetPlatform == localSystem) {
+    } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
       # Need to get rid of these when cross-compiling.
       inherit binutils binutils-unwrapped;
     };