diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-16 12:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-16 12:01:49 +0000 |
| commit | 2859a566944901987801fc84cb174aea04d06306 (patch) | |
| tree | 6bb777f67612e8214acc8f119778e6dc933acacb /pkgs/build-support | |
| parent | e789c7976fc6a4d5bfea37cbadc7267e4e00b59c (diff) | |
| parent | 0c64e91eab0eeeaa09245a8f4d613630eae2a99f (diff) | |
| download | nixpkgs-2859a566944901987801fc84cb174aea04d06306.tar nixpkgs-2859a566944901987801fc84cb174aea04d06306.tar.gz nixpkgs-2859a566944901987801fc84cb174aea04d06306.tar.bz2 nixpkgs-2859a566944901987801fc84cb174aea04d06306.tar.lz nixpkgs-2859a566944901987801fc84cb174aea04d06306.tar.xz nixpkgs-2859a566944901987801fc84cb174aea04d06306.tar.zst nixpkgs-2859a566944901987801fc84cb174aea04d06306.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/appimage/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix (renamed from pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix) | 0 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhsenv-bubblewrap/default.nix (renamed from pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix (renamed from pkgs/build-support/build-fhs-userenv/chrootenv/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhsenv-chroot/chrootenv/src/chrootenv.c (renamed from pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c) | 0 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhsenv-chroot/chrootenv/src/meson.build (renamed from pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build) | 0 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhsenv-chroot/default.nix (renamed from pkgs/build-support/build-fhs-userenv/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhsenv-chroot/env.nix (renamed from pkgs/build-support/build-fhs-userenv/env.nix) | 0 |
8 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index bcda40c800f..0637964ca62 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -6,7 +6,7 @@ , libarchive , pv , squashfsTools -, buildFHSUserEnv +, buildFHSEnv , pkgs }: @@ -43,7 +43,7 @@ rec { extraPkgs, meta ? {}, ... - }: buildFHSUserEnv + }: buildFHSEnv (defaultFhsEnvArgs // { inherit name; diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 78da74c8284..78da74c8284 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 5d94c309fe0..5d94c309fe0 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix index 32ac43d4155..32ac43d4155 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c b/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/chrootenv.c index c109d7297e1..c109d7297e1 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c +++ b/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/chrootenv.c diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build b/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/meson.build index 6d0770a0dc4..6d0770a0dc4 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build +++ b/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/meson.build diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhsenv-chroot/default.nix index 6f0adfb4e08..6f0adfb4e08 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhsenv-chroot/default.nix diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix index fbc50c2dc25..fbc50c2dc25 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhsenv-chroot/env.nix |