new breakthroughs in nix technology

float3 · Apr 11, 2024 · 66d90da · 66d90da
1 parent 249d5a0
commit 66d90da
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 /target
-rustup.sh
-lint.sh
+rustup.sh
diff --git a/default.nix b/default.nix
@@ -6,9 +6,11 @@ pkgs.mkShell {
     pkg-config
     rustup
     gcc
+    openimagedenoise
   ];
 
   shellHook = ''
+    export OIDN_DIR="${pkgs.openimagedenoise}/lib";
     export LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH";
     export LD_LIBRARY_PATH=./oidn/oidn/lib:$LD_LIBRARY_PATH
     export OPENSSL_DIR=${pkgs.openssl.dev}

diff --git a/lint.sh b/lint.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p cargo rustup openimagedenoise
+
+cargo update --workspace 
+cargo clippy --fix --allow-dirty --allow-staged --all-targets --all-features --workspace  -- -D warnings
+cargo fix --allow-dirty --allow-staged --all-targets --all-features --workspace 
+cargo fmt --all 
+cargo check --all-targets --all-features --workspace --release
+cargo test --all-targets --all-features --workspace --release 
+cargo build --all-targets --all-features --workspace --release
+cargo run --release
diff --git a/shell.nix b/shell.nix
@@ -6,11 +6,13 @@ pkgs.mkShell {
     pkg-config
     rustup
     gcc
+    openimagedenoise
   ];
 
   shellHook = ''
+    export OIDN_DIR="${pkgs.openimagedenoise}/lib";
     export LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH";
-    export LD_LIBRARY_PATH=./oidn/oidn/lib:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH="${pkgs.openimagedenoise}/lib:$LD_LIBRARY_PATH";
     export OPENSSL_DIR=${pkgs.openssl.dev}
     export OPENSSL_LIB_DIR=${pkgs.openssl.out}/lib
     export OPENSSL_INCLUDE_DIR=${pkgs.openssl.dev}/include