diff options
author | Artturi <Artturin@artturin.com> | 2022-12-23 18:50:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-23 18:50:57 +0200 |
commit | 0fbd19f3d9125184212f0f3a7cdb34214a5be48d (patch) | |
tree | 6c2951634dd5ada824d9740dca531fa91dcb970c | |
parent | 154c9b56a440f22f22ef8ee698d0f95aca7a9bea (diff) | |
parent | 065b54ffabce9826506913887be1fc33e1a96f66 (diff) |
Merge pull request #207315 from Artturin/fixcrossevalissues1
-rw-r--r-- | pkgs/applications/version-management/gitflow/default.nix | 12 | ||||
-rw-r--r-- | pkgs/build-support/node/build-npm-package/hooks/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/beam-modules/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/beam-modules/lib.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/icu/63.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
6 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/applications/version-management/gitflow/default.nix b/pkgs/applications/version-management/gitflow/default.nix index ce612fcd52d3..09ab7031bd23 100644 --- a/pkgs/applications/version-management/gitflow/default.nix +++ b/pkgs/applications/version-management/gitflow/default.nix @@ -1,6 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub }: - -with pkgs.lib; +{ lib, stdenv, fetchFromGitHub, makeWrapper, getopt, git, coreutils }: stdenv.mkDerivation rec { pname = "gitflow"; @@ -13,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; preBuild = '' makeFlagsArray+=(prefix="$out") @@ -21,9 +19,9 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/git-flow \ - --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt \ - --suffix PATH : ${pkgs.git}/bin \ - --prefix PATH : ${pkgs.coreutils}/bin + --set FLAGS_GETOPT_CMD ${getopt}/bin/getopt \ + --suffix PATH : ${git}/bin \ + --prefix PATH : ${coreutils}/bin ''; meta = with lib; { diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index ff0930426d4e..65ac661cea51 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -26,7 +26,7 @@ npmInstallHook = makeSetupHook { name = "npm-install-hook"; - deps = [ makeWrapper ]; + deps = [ buildPackages.makeWrapper ]; substitutions = { hostNode = "${nodejs}/bin/node"; jq = "${buildPackages.jq}/bin/jq"; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 068e1da33133..86f7d94eed1b 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,6 +1,7 @@ -{ lib, pkgs, erlang }: +{ lib, __splicedPackages, erlang }: let + pkgs = __splicedPackages; inherit (lib) makeExtensible; lib' = pkgs.callPackage ./lib.nix { }; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 1b021cf93472..2d93b28cda6b 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,5 +1,8 @@ -{ pkgs, lib }: +{ __splicedPackages, lib }: +let + pkgs = __splicedPackages; +in rec { /* Similar to callPackageWith/callPackage, but without makeOverridable diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 07684d8db818..19838763f5b4 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }: +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }: import ./base.nix { version = "63.1"; @@ -11,4 +11,4 @@ import ./base.nix { }) ]; patchFlags = [ "-p3" ]; -} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; } +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f210979796a..e7b2772e1893 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -973,7 +973,8 @@ with pkgs; makeShellWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { - shell = targetPackages.runtimeShell; + # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not __raw) + shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; }; passthru = { tests = tests.makeWrapper; |