diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-14 01:40:09 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-14 01:40:09 +0200 |
commit | ac6a4f7cf5b14247f02736804f440c56a98ca1c6 (patch) | |
tree | 4a10835a9fe4614923cb445ce43f475240c7c303 /pkgs/build-support | |
parent | 882b692c4f238df3a63140b891b54fd9a7d87a4f (diff) | |
parent | 39e3f7c2cc3d5ad71561136df41beca52bfa35c6 (diff) | |
download | nixlib-ac6a4f7cf5b14247f02736804f440c56a98ca1c6.tar nixlib-ac6a4f7cf5b14247f02736804f440c56a98ca1c6.tar.gz nixlib-ac6a4f7cf5b14247f02736804f440c56a98ca1c6.tar.bz2 nixlib-ac6a4f7cf5b14247f02736804f440c56a98ca1c6.tar.lz nixlib-ac6a4f7cf5b14247f02736804f440c56a98ca1c6.tar.xz nixlib-ac6a4f7cf5b14247f02736804f440c56a98ca1c6.tar.zst nixlib-ac6a4f7cf5b14247f02736804f440c56a98ca1c6.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/agda/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/mkshell/default.nix | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 984d61f1f751..ed7d11a13147 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -1,6 +1,6 @@ # Builder for Agda packages. -{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages, nixosTests }: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, ghcWithPackages, nixosTests }: with lib.strings; diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index a70dc0390cb5..7ca4cc23c1d5 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -3,18 +3,22 @@ # A special kind of derivation that is only meant to be consumed by the # nix-shell. { - inputsFrom ? [], # a list of derivations whose inputs will be made available to the environment - buildInputs ? [], - nativeBuildInputs ? [], - propagatedBuildInputs ? [], - propagatedNativeBuildInputs ? [], - ... + # a list of packages to add to the shell environment + packages ? [ ] +, # propagate all the inputs from the given derivations + inputsFrom ? [ ] +, buildInputs ? [ ] +, nativeBuildInputs ? [ ] +, propagatedBuildInputs ? [ ] +, propagatedNativeBuildInputs ? [ ] +, ... }@attrs: let mergeInputs = name: lib.concatLists (lib.catAttrs name - ([attrs] ++ inputsFrom)); + ([ attrs ] ++ inputsFrom)); rest = builtins.removeAttrs attrs [ + "packages" "inputsFrom" "buildInputs" "nativeBuildInputs" @@ -26,15 +30,15 @@ in stdenv.mkDerivation ({ name = "nix-shell"; - phases = ["nobuildPhase"]; + phases = [ "nobuildPhase" ]; buildInputs = mergeInputs "buildInputs"; - nativeBuildInputs = mergeInputs "nativeBuildInputs"; + nativeBuildInputs = packages ++ (mergeInputs "nativeBuildInputs"); propagatedBuildInputs = mergeInputs "propagatedBuildInputs"; propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs"; shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook" - (lib.reverseList inputsFrom ++ [attrs])); + (lib.reverseList inputsFrom ++ [ attrs ])); nobuildPhase = '' echo |