Merge pull request #453 from tock/fix-nix-shell

Fix nix shell: withUnfreePackages = false
tock · Jul 2, 2024 · 0fd309f · 0fd309f
2 parents 6d9340f + 0d46004
commit 0fd309f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/shell.nix b/shell.nix
@@ -56,6 +56,8 @@ in
 
     shellHook = ''
       # TODO: This should be patched into the rpath of the respective libraries!
-      export LD_LIBRARY_PATH=${pkgs.libusb}/lib:${pkgs.segger-jlink}/lib:$LD_LIBRARY_PATH
-    '';
+      export LD_LIBRARY_PATH=${pkgs.libusb}/lib:$LD_LIBRARY_PATH
+    '' + (lib.optionalString withUnfreePkgs ''
+      export LD_LIBRARY_PATH=${pkgs.segger-jlink}/lib:$LD_LIBRARY_PATH
+    '');
   }