From e2951dc702934f305dc0c746a8383487cc3e54f5 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 23 Jan 2024 12:45:00 +0100 Subject: [PATCH 1/3] feat: allow unfree --- modules/nixos/nix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 58c3139..81e7c72 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -61,6 +61,7 @@ in auto-optimise-store = true; trusted-users = users; allowed-users = users; + allowUnfree = true; substituters = [ cfg.default-substituter.url ] From cc6fc792d644349201a5a7a7eca7c68eab817ae7 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 23 Jan 2024 12:45:22 +0100 Subject: [PATCH 2/3] feat: use nix-ld --- systems/x86_64-linux/sgx-nixos/default.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/systems/x86_64-linux/sgx-nixos/default.nix b/systems/x86_64-linux/sgx-nixos/default.nix index aed6878..6eb3d3d 100644 --- a/systems/x86_64-linux/sgx-nixos/default.nix +++ b/systems/x86_64-linux/sgx-nixos/default.nix @@ -94,6 +94,24 @@ with lib.plusultra; flake = "git+https://git.hoyer.xyz/harald/nixcfg#sgx-nixos"; }; + programs.nix-ld.enable = true; + + # Sets up all the libraries to load + programs.nix-ld.libraries = with pkgs; [ + stdenv.cc.cc + libclang.lib + zlib + fuse3 + icu + nss + curl + expat + freetype + glib + openssl + # ... + ]; + security = { sudo = { enable = true; @@ -114,6 +132,8 @@ with lib.plusultra; tpm2-tools vim wget + clang + pkg-config ]; environment.shells = [ pkgs.fish pkgs.bash ]; From 3bece5697bfcb8bf07602cb01e5ab0e34cfc942d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 23 Jan 2024 12:45:34 +0100 Subject: [PATCH 3/3] chore: flake update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0398c5a..452b41d 100644 --- a/flake.lock +++ b/flake.lock @@ -608,11 +608,11 @@ ] }, "locked": { - "lastModified": 1705476964, - "narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=", + "lastModified": 1705659542, + "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "85c3b600f660abd86e94cbcd1c46733943197a07", + "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "type": "github" }, "original": { @@ -1084,11 +1084,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1705331948, - "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", + "lastModified": 1705458851, + "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", + "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", "type": "github" }, "original": {