From 29286e66daa724ef08692d9a65e9c88e5467d9b2 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 21 Nov 2024 00:58:16 -0500 Subject: [PATCH] custom nix --- CMakeLists.txt | 2 +- build_emscript.sh | 0 default.nix | 6 +++++- resources/fonts/a.out | Bin 4 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 build_emscript.sh mode change 100644 => 100755 resources/fonts/a.out diff --git a/CMakeLists.txt b/CMakeLists.txt index a97183b..6e7ddd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.25) include(FetchContent) -set(BLT_GRAPHICS_VERSION 1.1.3) +set(BLT_GRAPHICS_VERSION 1.1.4) set(BLT_GRAPHICS_TEST_VERSION 0.0.1) project(BLT_WITH_GRAPHICS VERSION ${BLT_GRAPHICS_VERSION}) diff --git a/build_emscript.sh b/build_emscript.sh old mode 100644 new mode 100755 diff --git a/default.nix b/default.nix index 1c2c439..8259cac 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,9 @@ { pkgs ? (import { config.allowUnfree = true; config.segger-jlink.acceptLicense = true; +}), customPkgs ? (import /home/brett/my-nixpkgs { + config.allowUnfree = true; + config.segger-jlink.acceptLicense = true; }), ... }: pkgs.mkShell { @@ -10,7 +13,8 @@ pkgs.mkShell clang emscripten ninja - jetbrains.clion + customPkgs.jetbrains.clion + #clion = import ~/my-nixpkgs/pkgs/applications/editors/jetbrains {}; renderdoc valgrind ]; diff --git a/resources/fonts/a.out b/resources/fonts/a.out old mode 100644 new mode 100755