buildFHSUserEnv: use bubblewrap by default

Atemu 1baab4e1 85b08152

Changed files
+8 -21
pkgs
top-level
+8 -21
pkgs/top-level/all-packages.nix
···
appflowy = callPackage ../applications/office/appflowy { };
-
appimageTools = callPackage ../build-support/appimage {
-
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
-
};
+
appimageTools = callPackage ../build-support/appimage { };
appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { };
···
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 { };
···
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 { };
···
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 { };
···
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;
···
heroic-unwrapped = callPackage ../games/heroic { };
-
heroic = callPackage ../games/heroic/fhsenv.nix {
-
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
-
};
+
heroic = callPackage ../games/heroic/fhsenv.nix { };
julius = callPackage ../games/julius { };
···
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 { };
···
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;