diff options
| author | Artturin <Artturin@artturin.com> | 2022-12-22 17:08:37 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-12-22 20:50:27 +0200 |
| commit | b36d9696c5e215d9885b8c6555ffc43b816dbd6d (patch) | |
| tree | 2f1c5cc0ba9fd32a04c8a5f02ab889114f0598ff | |
| parent | 9d39fe1577b38e553c63d60527b8fd54139d72fd (diff) | |
treewide: fix error: attribute 'runtimeShell' missing
4 files changed, 12 insertions, 10 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 |