From 1e4ae176211b3f857acc5eba22d9988d0002ccd0 Mon Sep 17 00:00:00 2001 From: nek0 Date: Fri, 2 Dec 2022 02:57:30 +0100 Subject: [PATCH] update sources --- flake.lock | 6 +++--- flake.nix | 26 +++++++++++++++++++------- vulkan-tutorial.cabal | 1 + 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index bf447f0..9447c06 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669897001, - "narHash": "sha256-5xESSKSgBPhjctRYUzES8RiMo+OmA2E/D74RNULQb9M=", + "lastModified": 1669927173, + "narHash": "sha256-Z7rSKzC5OuWv5Q7RRNQPZb0jVJRJk0BJB6/fGZzaAIU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dcc26b62da6963053c299af3e19b89b94924edec", + "rev": "9063accddd2e68dcc71032459a58399e977374c9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index edcbf67..dfcefad 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; })); packageName = "vulkan-tutorial"; - in { + in rec { packages.${packageName} = # (ref:haskell-package-def) haskellPackages.callCabal2nix packageName self rec { # Dependency overrides go here @@ -25,18 +25,30 @@ defaultPackage = self.packages.${system}.${packageName}; - devShell = pkgs.mkShell { + devShell = haskellPackages.shellFor { + packages = p: [ defaultPackage ]; + withHoogle = true; buildInputs = with haskellPackages; [ haskell-language-server ghcid cabal-install ]; - nativeBuildInputs = with pkgs; [ - pkg-config - SDL2 - ]; - inputsFrom = builtins.attrValues self.packages.${system}; }; + #devShell = pkgs.mkShell { + # buildInputs = with haskellPackages; [ + # haskell-language-server + # ghcid + # cabal-install + # ]; + # nativeBuildInputs = with pkgs; [ + # pkg-config + # SDL2 + # vulkan-validation-layers + # vulkan-headers + # vulkan-loader + # ]; + # inputsFrom = builtins.attrValues self.packages.${system}; + #}; }); } diff --git a/vulkan-tutorial.cabal b/vulkan-tutorial.cabal index 1b3a807..56f666f 100644 --- a/vulkan-tutorial.cabal +++ b/vulkan-tutorial.cabal @@ -40,6 +40,7 @@ executable vulkan-tutorial build-depends: base >=4.14.3.0 , sdl2 , vulkan + , vulkan-api , vulkan-utils , VulkanMemoryAllocator , linear