Merge pull request #225748 from Atemu/buildFHSEnvBubblewrap-by-default

buildFHSEnv: use bubblewrap by default

9 files changed, 21 insertions, 21 deletions

diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix
index 39b10bcb15c1c..7a7da42081d4a 100644
--- a/pkgs/games/anki/bin.nix
+++ b/pkgs/games/anki/bin.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd, commandLineArgs ? [] }:
+{ fetchurl, stdenv, lib, buildFHSEnv, appimageTools, writeShellScript, anki, undmg, zstd, commandLineArgs ? [] }:
 
 let
   pname = "anki-bin";
@@ -50,7 +50,7 @@ let
 
   passthru = { inherit sources; };
 
-  fhsUserEnvAnki = buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
+  fhsEnvAnki = buildFHSEnv (appimageTools.defaultFhsEnvArgs // {
     inherit pname version;
     name = null; # Appimage sets it to "appimage-env"
 
@@ -75,7 +75,7 @@ let
   });
 in
 
-if stdenv.isLinux then fhsUserEnvAnki
+if stdenv.isLinux then fhsEnvAnki
 else stdenv.mkDerivation {
   inherit pname version passthru;
 
diff --git a/pkgs/games/clonehero/fhs-wrapper.nix b/pkgs/games/clonehero/fhs-wrapper.nix
index cd7f3986b1090..83e9788c39ba7 100644
--- a/pkgs/games/clonehero/fhs-wrapper.nix
+++ b/pkgs/games/clonehero/fhs-wrapper.nix
@@ -1,6 +1,6 @@
 { clonehero-unwrapped
 , makeDesktopItem
-, buildFHSUserEnv
+, buildFHSEnv
 , liberation_ttf
 , callPackage
 }:
@@ -16,7 +16,7 @@ let
     categories = [ "Game" ];
   };
 in
-buildFHSUserEnv {
+buildFHSEnv {
   inherit name;
   inherit (clonehero-unwrapped) meta;
 
diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix
index 172e1aeafacb6..ecdbe749e3960 100644
--- a/pkgs/games/heroic/fhsenv.nix
+++ b/pkgs/games/heroic/fhsenv.nix
@@ -1,11 +1,11 @@
 { lib
-, buildFHSUserEnv
+, buildFHSEnv
 , heroic-unwrapped
 , extraPkgs ? pkgs: [ ]
 , extraLibraries ? pkgs: [ ]
 }:
 
-buildFHSUserEnv {
+buildFHSEnv {
   name = "heroic";
 
   runScript = "heroic";
diff --git a/pkgs/games/left4gore/default.nix b/pkgs/games/left4gore/default.nix
index 597f7da2b3d20..c203d03ab13e8 100644
--- a/pkgs/games/left4gore/default.nix
+++ b/pkgs/games/left4gore/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, fetchurl, buildFHSUserEnv }:
+{ stdenvNoCC, lib, fetchurl, buildFHSEnv }:
 
 let
   version = "2.3";
@@ -20,7 +20,7 @@ let
   };
 
   # FHS env, as patchelf will not work
-  env = buildFHSUserEnv {
+  env = buildFHSEnv {
     name = "left4gore-env-${version}";
     targetPkgs = _: [ left4gore-unwrapped ];
     runScript = "left4gore";
diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix
index 6fbe73a6bedfb..062a194c83dcc 100644
--- a/pkgs/games/runescape-launcher/default.nix
+++ b/pkgs/games/runescape-launcher/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , autoPatchelfHook
-, buildFHSUserEnv
+, buildFHSEnv
 , cairo
 , dpkg
 , fetchurl
@@ -109,10 +109,10 @@ in
 
   /*
   * We can patch the runescape launcher, but it downloads a client at runtime and checks it for changes.
-  * For that we need use a buildFHSUserEnv.
+  * For that we need use a buildFHSEnv.
   * FHS simulates a classic linux shell
   */
-  buildFHSUserEnv {
+  buildFHSEnv {
     name = "RuneScape";
     targetPkgs = pkgs: [
       runescape
diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/games/shticker-book-unwritten/default.nix
index aa02087a75aad..f19fe258f70b9 100644
--- a/pkgs/games/shticker-book-unwritten/default.nix
+++ b/pkgs/games/shticker-book-unwritten/default.nix
@@ -1,9 +1,9 @@
-{ buildFHSUserEnv, callPackage, lib }:
+{ buildFHSEnv, callPackage, lib }:
 let
 
   shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix { };
 
-in buildFHSUserEnv {
+in buildFHSEnv {
   name = "shticker_book_unwritten";
   targetPkgs = pkgs: with pkgs; [
       alsa-lib
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 9e7b815661c9e..538a66dcfd74e 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,5 +1,5 @@
 { makeScopeWithSplicing, generateSplicesForMkScope
-, stdenv, buildFHSUserEnv, pkgsi686Linux
+, stdenv, buildFHSEnv, pkgsi686Linux
 }:
 
 let
@@ -19,7 +19,7 @@ let
         if self.steamArch == "amd64"
         then pkgsi686Linux.steamPackages.steam-runtime-wrapped
         else null;
-      inherit buildFHSUserEnv;
+      inherit buildFHSEnv;
     };
     steam-fhsenv-small = steam-fhsenv.override { withGameSpecificLibraries = false; };
     steamcmd = callPackage ./steamcmd.nix { };
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 8d461104eaacd..4476b0c23c96a 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, writeShellScript, buildFHSUserEnv, steam, glxinfo-i686
+{ lib, stdenv, writeShellScript, buildFHSEnv, steam, glxinfo-i686
 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null
 , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
 , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
@@ -55,7 +55,7 @@ let
 
   envScript = lib.toShellVars extraEnv;
 
-in buildFHSUserEnv rec {
+in buildFHSEnv rec {
   name = "steam";
 
   targetPkgs = pkgs: with pkgs; [
@@ -270,7 +270,7 @@ in buildFHSUserEnv rec {
   # breaks the ability for application to reference shared memory.
   unsharePid = false;
 
-  passthru.run = buildFHSUserEnv {
+  passthru.run = buildFHSEnv {
     name = "steam-run";
 
     targetPkgs = commonTargetPkgs;
diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix
index 98b8917f6e2b0..a8ad86e11a9ca 100644
--- a/pkgs/games/unvanquished/default.nix
+++ b/pkgs/games/unvanquished/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , fetchpatch
 , SDL2
-, buildFHSUserEnv
+, buildFHSEnv
 , cmake
 , copyDesktopItems
 , curl
@@ -95,7 +95,7 @@ let
     '';
   };
 
-  fhsEnv = buildFHSUserEnv {
+  fhsEnv = buildFHSEnv {
     name = "unvanquished-fhs-wrapper";
 
     targetPkgs = pkgs: [ libstdcpp-preload-for-unvanquished-nacl ];