Skip to content

Commit 912bfe5

Browse files
authored
Merge pull request #3207 from input-output-hk/chore/LW-10649-no-nix-chroot
[LW-10649] Fix installing & running with strict AppArmor
2 parents c45ccc8 + 2da96b5 commit 912bfe5

File tree

15 files changed

+535
-398
lines changed

15 files changed

+535
-398
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## vNext
44

5+
### Fixes
6+
7+
- Fixed installation and running on Ubuntu 24.04 LTS with AppArmor enabled by removing the `chroot` ([PR 3207](https://github.com/input-output-hk/daedalus/pull/3207))
8+
59
### Chores
610

711
- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `7.1.3` and `@trezor/connect` to version `9.3.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3215))

flake.lock

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
tullia.flake = false; # otherwie, +1k dependencies in flake.lock…
1414
flake-compat.url = "github:input-output-hk/flake-compat";
1515
flake-compat.flake = false;
16+
nix-bundle-exe.url = "github:3noch/nix-bundle-exe";
17+
nix-bundle-exe.flake = false;
1618
};
1719

1820
outputs = inputs: let

installers/nix/linux.nix

Lines changed: 0 additions & 62 deletions
This file was deleted.

installers/nix/nix-installer.nix

Lines changed: 0 additions & 200 deletions
This file was deleted.

nix/devshells.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ let
4949
xcbuild
5050
perl
5151
] else [
52-
internal.electronBin
52+
internal.relocatableElectron
5353
winePackages.minimal
5454
]));
5555
name = "daedalus";

nix/internal/common.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ rec {
180180
srcWithoutNix = pkgs.lib.cleanSourceWith {
181181
src = inputs.self;
182182
filter = name: type: !(type == "regular" && (
183+
pkgs.lib.hasInfix "-source/nix/" name ||
183184
pkgs.lib.hasSuffix ".nix" name ||
184185
pkgs.lib.hasSuffix ".hs" name ||
185186
pkgs.lib.hasSuffix ".cabal" name

0 commit comments

Comments
 (0)