Unverified Commit a524bdb7 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234748 from NixOS/backport-234729-to-release-23.05 

[Backport release-23.05] nixos/pufferpanel: buildFHSUserEnv -> buildFHSEnv
parents 6287b47d bb0e9383

nixos/modules/services/misc/pufferpanel.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ in 
          services.pufferpanel = {

            enable = true;

            extraPackages = with pkgs; [ bash curl gawk gnutar gzip ];

            package = pkgs.buildFHSUserEnv {

            package = pkgs.buildFHSEnv {

              name = "pufferpanel-fhs";

              runScript = lib.getExe pkgs.pufferpanel;

              targetPkgs = pkgs': with pkgs'; [ icu openssl zlib ];
@@ -162,7 +162,7 @@ in 
        PrivateUsers = true;

        PrivateDevices = true;

        RestrictRealtime = true;

        RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSUserEnv

        RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSEnv

        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];

        LockPersonality = true;

        DeviceAllow = [ "" ];