haller33 · January 10, 2024 01:15 · Jan 10, 2024 · Dec 4, 2023 · Dec 4, 2023 · Dec 2, 2023
diff --git a/shell.nix b/shell.nix
@@ -20,6 +20,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+# Go To New Repo in Flakes!
+# the is now a new version of this shell using Flakes, that made this shell kind obsolete and major of development will move tho this new repo
+#
+# https://github.com/haller33/Odin-Flake
+# 
+
+
 let
   unstableTarball =
     fetchTarball

diff --git a/shell.nix b/shell.nix
@@ -1,6 +1,6 @@
 # MIT License
 # 
-# Copyright (c) 2023 Any
+# Copyright (c) 2023 haller33
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/shell.nix b/shell.nix
@@ -1,3 +1,25 @@
+# MIT License
+# 
+# Copyright (c) 2023 Any
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 let
   unstableTarball =
     fetchTarball

diff --git a/shell.nix b/shell.nix
@@ -31,8 +31,6 @@ mkShell {
 
       LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config";
 
-      LDFLAGS="-L${pkgs.stb}/lib";
-
       postPatch = lib.optionalString stdenv.isDarwin ''
         sed -i src/main.cpp \
           -e 's|-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk|-syslibroot ${MacOSX-SDK}|'

diff --git a/shell.nix b/shell.nix
@@ -42,18 +42,22 @@ mkShell {
           -e 's/LLVM-C/LLVM/' \
           -e 's/framework System/lSystem/'
 
-        echo "# for use of STB libraries"
-        cd vendor/stb/src
-        make
-        cd ../../..
-
         patchShebangs build_odin.sh
       '';
 
       dontConfigure = true;
 
       buildFlags = [ "release" ];
 
+      preBuild = ''
+
+        echo "# for use of STB libraries"
+        cd vendor/stb/src
+        make
+        cd ../../..
+
+      '';
+
       installPhase = ''
         runHook preInstall
 
@@ -99,8 +103,9 @@ mkShell {
     xorg.libXinerama
     libGL
 
-    stb
-    lua
+    ## not need because of vendor
+    # stb 
+    # lua
 
     valgrind
     rr

diff --git a/shell.nix b/shell.nix
@@ -43,8 +43,10 @@ mkShell {
           -e 's/framework System/lSystem/'
 
         echo "# for use of STB libraries"
-        make vendor/stb/src
-        
+        cd vendor/stb/src
+        make
+        cd ../../..
+
         patchShebangs build_odin.sh
       '';
 

diff --git a/shell.nix b/shell.nix
@@ -21,7 +21,7 @@ mkShell {
         owner = "odin-lang";
         repo = "Odin";
         rev = finalAttrs.version;
-        hash = "sha256-3juwOM/Ib9aiUpGCprIxh7lTL7YrtO3Y9M/csVRXTqQ=";
+        hash = "sha256-nBq/R2BYqSpuo8H0DBE4cgkV5OxyK5zSnhzRTpAp/FQ=";
         # name = "${finalAttrs.pname}-${finalAttrs.version}"; # not gona work .
       };
 

diff --git a/shell.nix b/shell.nix
@@ -43,9 +43,7 @@ mkShell {
           -e 's/framework System/lSystem/'
 
         echo "# for use of STB libraries"
-        cd vendor/stb/src
-        make
-        cd ../../../
+        make vendor/stb/src
         
         patchShebangs build_odin.sh
       '';

diff --git a/shell.nix b/shell.nix
@@ -10,7 +10,7 @@ mkShell {
 
   LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${
     with pkgs;
-    pkgs.lib.makeLibraryPath [ libGL xorg.libX11 xorg.libXi SDL2 SDL vulkan-loader stb ]
+    pkgs.lib.makeLibraryPath [ libGL xorg.libX11 xorg.libXi SDL2 SDL vulkan-loader glfw ]
   }";
   nativeBuildInputs = let
     odin_neo = pkgs.odin.overrideAttrs (finalAttrs: previousAttrs: {

diff --git a/shell.nix b/shell.nix
@@ -41,6 +41,12 @@ mkShell {
           -e 's/^GIT_SHA=.*$/GIT_SHA=/' \
           -e 's/LLVM-C/LLVM/' \
           -e 's/framework System/lSystem/'
+
+        echo "# for use of STB libraries"
+        cd vendor/stb/src
+        make
+        cd ../../../
+        
         patchShebangs build_odin.sh
       '';
 
@@ -75,6 +81,9 @@ mkShell {
     SDL2
     SDL
 
+    # GLFW
+    glfw
+
     # vulkan
     vulkan-headers
     vulkan-loader

diff --git a/shell.nix b/shell.nix
@@ -31,6 +31,8 @@ mkShell {
 
       LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config";
 
+      LDFLAGS="-L${pkgs.stb}/lib";
+
       postPatch = lib.optionalString stdenv.isDarwin ''
         sed -i src/main.cpp \
           -e 's|-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk|-syslibroot ${MacOSX-SDK}|'

diff --git a/shell.nix b/shell.nix
@@ -10,7 +10,7 @@ mkShell {
 
   LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${
     with pkgs;
-    pkgs.lib.makeLibraryPath [ libGL xorg.libX11 xorg.libXi SDL2 SDL vulkan-loader ]
+    pkgs.lib.makeLibraryPath [ libGL xorg.libX11 xorg.libXi SDL2 SDL vulkan-loader stb ]
   }";
   nativeBuildInputs = let
     odin_neo = pkgs.odin.overrideAttrs (finalAttrs: previousAttrs: {

diff --git a/shell.nix b/shell.nix
@@ -88,6 +88,9 @@ mkShell {
     xorg.libXinerama
     libGL
 
+    stb
+    lua
+
     valgrind
     rr
 

diff --git a/shell.nix b/shell.nix
@@ -87,6 +87,9 @@ mkShell {
     xorg.libXi
     xorg.libXinerama
     libGL
+
+    valgrind
+    rr
 
     # needed for raylib
     xorg.libXcursor

diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,96 @@
+let
+  unstableTarball =
+    fetchTarball
+      https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
+  pkgs = import <nixpkgs> { };
+  unstable = import unstableTarball {};
+in
+with pkgs;
+mkShell {
+
+  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${
+    with pkgs;
+    pkgs.lib.makeLibraryPath [ libGL xorg.libX11 xorg.libXi SDL2 SDL vulkan-loader ]
+  }";
+  nativeBuildInputs = let
+    odin_neo = pkgs.odin.overrideAttrs (finalAttrs: previousAttrs: {
+      pname = "odin_neo";
+      version = "master";
+
+      src = fetchFromGitHub {
+        owner = "odin-lang";
+        repo = "Odin";
+        rev = finalAttrs.version;
+        hash = "sha256-3juwOM/Ib9aiUpGCprIxh7lTL7YrtO3Y9M/csVRXTqQ=";
+        # name = "${finalAttrs.pname}-${finalAttrs.version}"; # not gona work .
+      };
+
+      nativeBuildInputs = [ makeBinaryWrapper which ];
+
+      buildInputs = lib.optional stdenv.isDarwin libiconv;
+
+      LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config";
+
+      postPatch = lib.optionalString stdenv.isDarwin ''
+        sed -i src/main.cpp \
+          -e 's|-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk|-syslibroot ${MacOSX-SDK}|'
+      '' + ''
+        sed -i build_odin.sh \
+          -e 's/^GIT_SHA=.*$/GIT_SHA=/' \
+          -e 's/LLVM-C/LLVM/' \
+          -e 's/framework System/lSystem/'
+        patchShebangs build_odin.sh
+      '';
+
+      dontConfigure = true;
+
+      buildFlags = [ "release" ];
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out/bin
+        cp odin $out/bin/odin
+
+        mkdir -p $out/share
+        cp -r core $out/share/core
+        cp -r vendor $out/share/vendor
+
+        wrapProgram $out/bin/odin \
+          --prefix PATH : ${
+            lib.makeBinPath (with llvmPackages; [ bintools llvm clang lld ])
+          } \
+          --set-default ODIN_ROOT $out/share
+
+        runHook postInstall
+      '';
+
+    });
+  in [ odin_neo ] ++ [
+    unstable.ols
+
+    # SDL
+    SDL2
+    SDL
+
+    # vulkan
+    vulkan-headers
+    vulkan-loader
+    vulkan-tools
+
+    glxinfo
+    lld
+    gnumake
+    xorg.libX11.dev
+    xorg.libX11
+    xorg.libXft
+    xorg.libXi
+    xorg.libXinerama
+    libGL
+
+    # needed for raylib
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXinerama
+  ];
+}