From 3ae7a5e8d4a9270b0c1cb3f1b5d0c7a893cb2896 Mon Sep 17 00:00:00 2001 From: Jan-Bulthuis Date: Mon, 10 Feb 2025 00:33:28 +0100 Subject: [PATCH] Rewrote if statement around defining LD_LIBRARY_PATH --- shell-modules/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/shell-modules/default.nix b/shell-modules/default.nix index 0b65f7f..8c70eb9 100644 --- a/shell-modules/default.nix +++ b/shell-modules/default.nix @@ -34,9 +34,16 @@ in recUpdate = nixpkgs.lib.recursiveUpdate; libPackages = evaluated.libPackages pkgs; shell = recUpdate { - env = evaluated.env // { - LD_LIBRARY_PATH = (nixpkgs.lib.mkIf (libPackages != [ ]) (nixpkgs.lib.makeLibraryPath libPackages)); - }; + env = + evaluated.env + // ( + if (libPackages != [ ]) then + { + LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath libPackages; + } + else + { } + ); packages = evaluated.packages ++ (evaluated.extraPackages pkgs) ++ libPackages; } evaluated.override; in