Commit 1baab4e1 authored by Atemu's avatar Atemu
Browse files

buildFHSUserEnv: use bubblewrap by default

parent 85b08152

pkgs/top-level/all-packages.nix

+8 −21
Original line number Diff line number Diff line
@@ -194,9 +194,7 @@ with pkgs; 














  appflowy = callPackage ../applications/office/appflowy { };



























  appimageTools = callPackage ../build-support/appimage {













    buildFHSUserEnv = buildFHSUserEnvBubblewrap;













  };













  appimageTools = callPackage ../build-support/appimage { };





























  appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { };
























@@ -373,8 +371,7 @@ with pkgs;



























  buildEnv = callPackage ../build-support/buildenv { }; # not actually a package



























  # TODO: eventually migrate everything to buildFHSUserEnvBubblewrap













  buildFHSUserEnv = buildFHSUserEnvChroot;













  buildFHSUserEnv = buildFHSUserEnvBubblewrap;















  buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { };















  buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { };
























@@ -12336,9 +12333,7 @@ with pkgs;













    openjdk = openjdk.override { enableJavaFX = true; };















  };



























  sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix {













    buildFHSUserEnv = buildFHSUserEnvBubblewrap;













  };













  sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { };





























  sparsehash = callPackage ../development/libraries/sparsehash { };
























@@ -28814,9 +28809,7 @@ with pkgs;













  ams-lv2 = callPackage ../applications/audio/ams-lv2 { };





























  androidStudioPackages = recurseIntoAttrs













    (callPackage ../applications/editors/android-studio {













      buildFHSUserEnv = buildFHSUserEnvBubblewrap;













    });













    (callPackage ../applications/editors/android-studio { });















  android-studio = androidStudioPackages.stable;





























  animbar = callPackage ../applications/graphics/animbar { };










@@ -31783,9 +31776,7 @@ with pkgs;













  luppp = callPackage ../applications/audio/luppp { };





























  lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { };













  lutris = callPackage ../applications/misc/lutris/fhsenv.nix {













    buildFHSUserEnv = buildFHSUserEnvBubblewrap;













  };













  lutris = callPackage ../applications/misc/lutris/fhsenv.nix { };















  lutris-free = lutris.override {















    steamSupport = false;















  };










@@ -35548,9 +35539,7 @@ with pkgs;



























  heroic-unwrapped = callPackage ../games/heroic { };



























  heroic = callPackage ../games/heroic/fhsenv.nix {













    buildFHSUserEnv = buildFHSUserEnvBubblewrap;













  };













  heroic = callPackage ../games/heroic/fhsenv.nix { };





























  julius = callPackage ../games/julius { };
























@@ -35654,7 +35643,7 @@ with pkgs;













  anki = callPackage ../games/anki {















    inherit (darwin.apple_sdk.frameworks) CoreAudio;















  };













  anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; };













  anki-bin = callPackage ../games/anki/bin.nix { };





























  armagetronad = callPackage ../games/armagetronad { };
























@@ -36487,9 +36476,7 @@ with pkgs;



























  stockfish = callPackage ../games/stockfish { };



























  steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam {













    buildFHSUserEnv = buildFHSUserEnvBubblewrap;













  });













  steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { });





























  steam = steamPackages.steam-fhsenv;















  steam-small = steamPackages.steam-fhsenv-small;