Skip to content

Commit

Permalink
Turn off auto-optimize-store on Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Hoverbear committed Jul 13, 2023
1 parent e5390fa commit b49a4df
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Differing from the current official [Nix](https://github.com/NixOS/nix) installe
* In `nix.conf`:
+ the `auto-allocate-uids`, `nix-command` and `flakes` features are enabled
+ `bash-prompt-prefix` is set
+ `auto-optimise-store` is set to `true` (On Linux only)
* `extra-nix-path` is set to `nixpkgs=flake:nixpkgs`
* `auto-allocate-uids` is set to `true`. (On Linux only)
* an installation receipt (for uninstalling) is stored at `/nix/receipt.json` as well as a copy of the install binary at `/nix/nix-installer`
Expand Down
4 changes: 0 additions & 4 deletions src/action/common/place_nix_configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ impl PlaceNixConfiguration {
},
};

// https://github.com/DeterminateSystems/nix-installer/issues/449#issuecomment-1551782281
#[cfg(not(target_os = "macos"))]
settings.insert("auto-optimise-store".to_string(), "true".to_string());

settings.insert(
"bash-prompt-prefix".to_string(),
"(nix:$name)\\040".to_string(),
Expand Down
1 change: 0 additions & 1 deletion tests/fixtures/linux/linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@
"settings": {
"experimental-features": "nix-command flakes auto-allocate-uids",
"build-users-group": "nixbld",
"auto-optimise-store": "true",
"bash-prompt-prefix": "(nix:$name)\\040",
"extra-nix-path": "nixpkgs=flake:nixpkgs",
"auto-allocate-uids": "true"
Expand Down
1 change: 0 additions & 1 deletion tests/fixtures/linux/steam-deck.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@
"path": "/etc/nix/nix.conf",
"pending_nix_config": {
"settings": {
"auto-optimise-store": "true",
"bash-prompt-prefix": "(nix:$name)\\040",
"build-users-group": "nixbld",
"experimental-features": "nix-command flakes auto-allocate-uids",
Expand Down
1 change: 0 additions & 1 deletion tests/fixtures/macos/macos.json
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@
"settings": {
"extra-nix-path": "nixpkgs=flake:nixpkgs",
"auto-allocate-uids": "true",
"auto-optimise-store": "true",
"build-users-group": "nixbld",
"bash-prompt-prefix": "(nix:$name)\\040",
"experimental-features": "nix-command flakes auto-allocate-uids"
Expand Down

0 comments on commit b49a4df

Please sign in to comment.