From c01f5d71f262497a5fa40dd526989cae1d2062bb Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Mon, 22 Sep 2025 09:54:38 +0200 Subject: [PATCH] chore(c): Update --- c/flake.lock | 12 ++++++------ c/flake.nix | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/c/flake.lock b/c/flake.lock index 64b483e..d57185e 100644 --- a/c/flake.lock +++ b/c/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729818716, - "narHash": "sha256-XRfkUsxLzFkMn3Tpstio1gNOIQ+2PZPCKbifJ2IXxlw=", + "lastModified": 1755082269, + "narHash": "sha256-Ix7ALeaxv9tW4uBKWeJnaKpYZtZiX4H4Q/MhEmj4XYA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "062c4f59744fcffa2e5aa3ef443dc8b4d1674ed6", + "rev": "d74de548348c46cf25cb1fcc4b74f38103a4590d", "type": "github" }, "original": { diff --git a/c/flake.nix b/c/flake.nix index 7c10da2..1c7b728 100644 --- a/c/flake.nix +++ b/c/flake.nix @@ -16,17 +16,52 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ - cmake + #cmake gcc + #gccStdenv gnumake - valgrind + # valgrind - astyle + #astyle + + # CUDA https://nixos.wiki/wiki/CUDA#cudatoolkit.2C_cudnn.2C_and_related_packages +# git gitRepo gnupg autoconf curl +# procps gnumake util-linux m4 gperf unzip +# cudatoolkit linuxPackages.nvidia_x11 +# libGLU libGL +# xorg.libXi xorg.libXmu freeglut +# xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib +# xorg.libXinerama +# ncurses5 stdenv.cc binutils +# +# glib +# glibc +# +# intel-ocl +# intel-compute-runtime +# opencl-clhpp +# opencl-clang +# opencl-headers +# ocl-icd +# +# pkgconf +# waylandpp +# xorg.libXcursor # You might want to use your own IDE. - # (jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ]) + #(jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ]) + #vscodium ]; + + shellHook = '' + export CUDA_PATH=${pkgs.cudatoolkit} + # export LD_LIBRARY_PATH=${pkgs.linuxPackages.nvidia_x11}/lib:${pkgs.ncurses5}/lib + # export LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib" + export LD_LIBRARY_PATH="${pkgs.libGL}/lib/:${pkgs.stdenv.cc.cc.lib}/lib/:${pkgs.glibc}/lib" + export EXTRA_LDFLAGS="-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib" + export EXTRA_CCFLAGS="-I/usr/include" + ''; }; }); }