diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-18 16:52:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 16:52:30 -0400 |
| commit | 35378f014161c1d794dc89b6969275396cb601de (patch) | |
| tree | 8026f592376791dae1932b2b7a02377172c6b6f1 /pkgs/stdenv/generic | |
| parent | 5664e64a015354e8b5e3c0cc4e9e7fac0db5f3dc (diff) | |
| parent | 2091133e789b22b33cdb85af99e36c5589faf1db (diff) | |
| download | nixlib-35378f014161c1d794dc89b6969275396cb601de.tar nixlib-35378f014161c1d794dc89b6969275396cb601de.tar.gz nixlib-35378f014161c1d794dc89b6969275396cb601de.tar.bz2 nixlib-35378f014161c1d794dc89b6969275396cb601de.tar.lz nixlib-35378f014161c1d794dc89b6969275396cb601de.tar.xz nixlib-35378f014161c1d794dc89b6969275396cb601de.tar.zst nixlib-35378f014161c1d794dc89b6969275396cb601de.zip | |
Merge pull request #46857 from obsidiansystems/darwin-to-linux-prep
misc pkgs: various cross fixes in preparation for darwin->linux
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index e1ce3200e8c9..c663c3743ed6 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -83,9 +83,7 @@ rec { doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; - outputs' = - outputs ++ - (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []); + outputs' = outputs ++ lib.optional separateDebugInfo "debug"; fixedOutputDrv = attrs ? outputHash; noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated @@ -176,7 +174,7 @@ rec { // { # A hack to make `nix-env -qa` and `nix search` ignore broken packages. # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix. - name = assert validity.handled; name + lib.optionalString + name = assert validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); name + lib.optionalString # Fixed-output derivations like source tarballs shouldn't get a host # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the |