41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
diff --git a/apparmor.d/tunables/multiarch.d/system b/apparmor.d/tunables/multiarch.d/system
|
|
index be37123f..908951af 100644
|
|
--- a/apparmor.d/tunables/multiarch.d/system
|
|
+++ b/apparmor.d/tunables/multiarch.d/system
|
|
@@ -106,8 +106,21 @@
|
|
@{MOUNTS}=@{MOUNTDIRS}/*/ @{run}/user/@{uid}/gvfs/
|
|
|
|
# Common places for binaries and libraries across distributions
|
|
-@{bin}=/{,usr/}{,s}bin
|
|
-@{lib}=/{,usr/}lib{,exec,32,64}
|
|
+@{package1}={@{w},.,-}
|
|
+@{package2}=@{package1}@{package1}
|
|
+@{package4}=@{package2}@{package2}
|
|
+@{package8}=@{package4}@{package4}
|
|
+@{package16}=@{package8}@{package8}
|
|
+@{package32}=@{package16}@{package16}
|
|
+@{package64}=@{package32}@{package32}
|
|
+@{nix_package_name}={@{package32},}{@{package16},}{@{package8},}{@{package4},}{@{package2},}{@{package1},}
|
|
+
|
|
+
|
|
+
|
|
+@{nix_store}=/nix/store/@{rand32}-@{nix_package_name}
|
|
+@{base_paths}={@{nix_store},/run/current-system/sw,/etc/profiles/per-user/@{user}}
|
|
+@{bin}={@{base_paths}/{bin,libexec},/{,usr/}{,s}bin}
|
|
+@{lib}=@{base_paths}/lib{exec,}
|
|
|
|
# Common places for temporary files
|
|
@{tmp}=/tmp/ /tmp/user/@{uid}/
|
|
diff --git a/cmd/prebuild/main.go b/cmd/prebuild/main.go
|
|
index 91f77e2e..ab4b8c5e 100644
|
|
--- a/cmd/prebuild/main.go
|
|
+++ b/cmd/prebuild/main.go
|
|
@@ -31,7 +31,6 @@ func init() {
|
|
|
|
// Build tasks applied by default
|
|
builder.Register(
|
|
- "userspace", // Resolve variable in profile attachments
|
|
"hotfix", // Temporary fix for #74, #80 & #235
|
|
)
|
|
|