···

       
250
       
250
       
 
       
:::

     

       
251
       
251
       
 
       


     

       
252
       
252
       
 
       
::: {.note}

     

       
253
       
253
       
-
       
If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon.

     

       
253
       
253
       
+
       
If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.__spliced.buildHost` or `.__spliced.hostTarget`.

     

       
254
       
254
       
 
       
:::

     

···

       
38
       
38
       
 
       
      //

     

       
39
       
39
       
 
       
      (drv.passthru or {})

     

       
40
       
40
       
 
       
      //

     

       
41
       
41
       
+
       
      # TODO(@Artturin): remove before release 23.05 and only have __spliced.

     

       
41
       
42
       
 
       
      (lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) {

     

       
42
       
43
       
 
       
        crossDrv = overrideDerivation drv.crossDrv f;

     

       
43
       
44
       
 
       
        nativeDrv = overrideDerivation drv.nativeDrv f;

     

···

       
76
       
76
       
 
       


     

       
77
       
77
       
 
       
  nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;

     

       
78
       
78
       
 
       


     

       
79
       
79
       
-
       
  STRIP = if strip then "${(binutils.nativeDrv or binutils).targetPrefix}strip" else null;

     

       
79
       
79
       
+
       
  STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null;

     

       
80
       
80
       
 
       
}) ''

     

       
81
       
81
       
 
       
  mkdir ./root

     

       
82
       
82
       
 
       
  make-initrd-ng "$contentsPath" ./root

     

···

       
1
       
1
       
-
       
{ lib, makeSetupHook, nodejs, srcOnly, diffutils, jq, makeWrapper }:

     

       
1
       
1
       
+
       
{ lib, makeSetupHook, nodejs, srcOnly, buildPackages, makeWrapper }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
{

     

       
4
       
4
       
 
       
  npmConfigHook = makeSetupHook

     
···

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
        # Specify the stdenv's `diff` and `jq` by abspath to ensure that the user's build

     

       
11
       
11
       
 
       
        # inputs do not cause us to find the wrong binaries.

     

       
12
       
12
       
-
       
        # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available.

     

       
13
       
13
       
-
       
        diff = "${diffutils.nativeDrv or diffutils}/bin/diff";

     

       
14
       
14
       
-
       
        jq = "${jq.nativeDrv or jq}/bin/jq";

     

       
12
       
12
       
+
       
        diff = "${buildPackages.diffutils}/bin/diff";

     

       
13
       
13
       
+
       
        jq = "${buildPackages.jq}/bin/jq";

     

       
15
       
14
       
 
       


     

       
16
       
15
       
 
       
        nodeVersion = nodejs.version;

     

       
17
       
16
       
 
       
        nodeVersionMajor = lib.versions.major nodejs.version;

     
···

       
29
       
28
       
 
       
      deps = [ makeWrapper ];

     

       
30
       
29
       
 
       
      substitutions = {

     

       
31
       
30
       
 
       
        hostNode = "${nodejs}/bin/node";

     

       
32
       
32
       
-
       
        jq = "${jq.nativeDrv or jq}/bin/jq";

     

       
31
       
31
       
+
       
        jq = "${buildPackages.jq}/bin/jq";

     

       
33
       
32
       
 
       
      };

     

       
34
       
33
       
 
       
    } ./npm-install-hook.sh;

     

       
35
       
34
       
 
       
}

     

···

       
2
       
2
       
 
       
, callPackage

     

       
3
       
3
       
 
       
, cargo

     

       
4
       
4
       
 
       
, clang

     

       
5
       
5
       
-
       
, diffutils

     

       
6
       
5
       
 
       
, lib

     

       
7
       
6
       
 
       
, makeSetupHook

     

       
8
       
7
       
 
       
, maturin

     
···

       
65
       
64
       
 
       


     

       
66
       
65
       
 
       
        # Specify the stdenv's `diff` by abspath to ensure that the user's build

     

       
67
       
66
       
 
       
        # inputs do not cause us to find the wrong `diff`.

     

       
68
       
68
       
-
       
        # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available.

     

       
69
       
69
       
-
       
        diff = "${diffutils.nativeDrv or diffutils}/bin/diff";

     

       
67
       
67
       
+
       
        diff = "${lib.getBin buildPackages.diffutils}/bin/diff";

     

       
70
       
68
       
 
       


     

       
71
       
69
       
 
       
        # We want to specify the correct crt-static flag for both

     

       
72
       
70
       
 
       
        # the build and host platforms. This is important when the wanted

     

···

       
107
       
107
       
 
       
      } ./hooks/qmake-hook.sh;

     

       
108
       
108
       
 
       
    };

     

       
109
       
109
       
 
       


     

       
110
       
110
       
+
       
  # TODO(@Artturin): convert to makeScopeWithSplicing

     

       
111
       
111
       
+
       
  # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01

     

       
110
       
112
       
 
       
  self = lib.makeScope newScope addPackages;

     

       
111
       
113
       
 
       
in

     

       
112
       
114
       
 
       
self

     

···

       
61
       
61
       
 
       
      if [[ -z "$dontSyncQt" && -f sync.profile ]]; then

     

       
62
       
62
       
 
       
        # FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs

     

       
63
       
63
       
 
       
        # I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin

     

       
64
       
64
       
-
       
        ${self.qtbase.dev.nativeDrv or self.qtbase.dev}/libexec/syncqt.pl -version "''${version%%-*}"

     

       
64
       
64
       
+
       
        ${lib.getDev self.qtbase}/libexec/syncqt.pl -version "''${version%%-*}"

     

       
65
       
65
       
 
       
      fi

     

       
66
       
66
       
 
       
    '';

     

       
67
       
67
       
 
       


     

···

       
209
       
209
       
 
       
  dependencies = map (map lib.chooseDevOutputs) [

     

       
210
       
210
       
 
       
    [

     

       
211
       
211
       
 
       
      (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild))

     

       
212
       
212
       
-
       
      (map (drv: drv.nativeDrv or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs

     

       
212
       
212
       
+
       
      (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs

     

       
213
       
213
       
 
       
         ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh

     

       
214
       
214
       
 
       
         ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh

     

       
215
       
215
       
 
       
         ++ lib.optionals doCheck checkInputs

     
···

       
218
       
218
       
 
       
    ]

     

       
219
       
219
       
 
       
    [

     

       
220
       
220
       
 
       
      (map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost))

     

       
221
       
221
       
-
       
      (map (drv: drv.crossDrv or drv) (checkDependencyList "buildInputs" buildInputs))

     

       
221
       
221
       
+
       
      (map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "buildInputs" buildInputs))

     

       
222
       
222
       
 
       
    ]

     

       
223
       
223
       
 
       
    [

     

       
224
       
224
       
 
       
      (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget))

     
···

       
227
       
227
       
 
       
  propagatedDependencies = map (map lib.chooseDevOutputs) [

     

       
228
       
228
       
 
       
    [

     

       
229
       
229
       
 
       
      (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated))

     

       
230
       
230
       
-
       
      (map (drv: drv.nativeDrv or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs))

     

       
230
       
230
       
+
       
      (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs))

     

       
231
       
231
       
 
       
      (map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated))

     

       
232
       
232
       
 
       
    ]

     

       
233
       
233
       
 
       
    [

     

       
234
       
234
       
 
       
      (map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHostPropagated" depsHostHostPropagated))

     

       
235
       
235
       
-
       
      (map (drv: drv.crossDrv or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs))

     

       
235
       
235
       
+
       
      (map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs))

     

       
236
       
236
       
 
       
    ]

     

       
237
       
237
       
 
       
    [

     

       
238
       
238
       
 
       
      (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated))

     

···

       
8
       
8
       
 
       
# The solution is to splice the package sets together as we do below, so every

     

       
9
       
9
       
 
       
# `callPackage`d expression in fact gets both versions. Each# derivation (and

     

       
10
       
10
       
 
       
# each derivation's outputs) consists of the run-time version, augmented with a

     

       
11
       
11
       
-
       
# `nativeDrv` field for the build-time version, and `crossDrv` field for the

     

       
11
       
11
       
+
       
# `__spliced.buildHost` field for the build-time version, and `__spliced.hostTarget` field for the

     

       
12
       
12
       
 
       
# run-time version.

     

       
13
       
13
       
-
       
#

     

       
14
       
14
       
-
       
# We could have used any names we want for the disambiguated versions, but

     

       
15
       
15
       
-
       
# `crossDrv` and `nativeDrv` were somewhat similarly used for the old

     

       
16
       
16
       
-
       
# cross-compiling infrastructure. The names are mostly invisible as

     

       
17
       
17
       
-
       
# `mkDerivation` knows how to pull out the right ones for `buildDepends` and

     

       
18
       
18
       
-
       
# friends, but a few packages use them directly, so it seemed efficient (to

     

       
19
       
19
       
-
       
# @Ericson2314) to reuse those names, at least initially, to minimize breakage.

     

       
20
       
13
       
 
       
#

     

       
21
       
14
       
 
       
# For performance reasons, rather than uniformally splice in all cases, we only

     

       
22
       
15
       
 
       
# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice`

     
···

       
46
       
39
       
 
       
        valueHostTarget = pkgsHostTarget.${name} or {};

     

       
47
       
40
       
 
       
        valueTargetTarget = pkgsTargetTarget.${name} or {};

     

       
48
       
41
       
 
       
        augmentedValue = defaultValue

     

       
49
       
49
       
-
       
          # TODO(@Ericson2314): Stop using old names after transition period

     

       
50
       
50
       
-
       
          // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = valueBuildHost; })

     

       
51
       
51
       
-
       
          // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = valueHostTarget; })

     

       
42
       
42
       
+
       
          # TODO(@Artturin): remove before release 23.05 and only have __spliced.

     

       
43
       
43
       
+
       
          // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = lib.warn "use ${name}.__spliced.buildHost instead of ${name}.nativeDrv" valueBuildHost; })

     

       
44
       
44
       
+
       
          // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = lib.warn "use ${name}.__spliced.hostTarget instead of ${name}.crossDrv" valueHostTarget; })

     

       
52
       
45
       
 
       
          // {

     

       
53
       
46
       
 
       
            __spliced =

     

       
54
       
47
       
 
       
                 (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })

     

       
48
       
48
       
+
       
              // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; })

     

       
55
       
49
       
 
       
              // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })

     

       
56
       
50
       
 
       
              // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })

     

       
51
       
51
       
+
       
              // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; })

     

       
57
       
52
       
 
       
              // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget;

     

       
58
       
53
       
 
       
          });

     

       
59
       
54
       
 
       
        };