From 5b434e3621f35b6b258a95808b74261475be4155 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sun, 15 Jun 2025 19:12:07 +0200 Subject: [PATCH] Cleanup --- default.nix | 7 ------- flake.nix | 11 ++++++++++- shell.nix | 7 ------- 3 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 default.nix delete mode 100644 shell.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index 39bacff..0000000 --- a/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -(import ( - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz"; - sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; } -) { - src = ./.; -}).defaultNix diff --git a/flake.nix b/flake.nix index a778e3f..ee8e128 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,15 @@ naersk-lib = pkgs.callPackage naersk { }; in { - defaultPackage = naersk-lib.buildPackage ./.; + defaultPackage = naersk-lib.buildPackage rec { + src = ./.; + nativeBuildInputs = with pkgs; [ + libnotify + ]; + LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath nativeBuildInputs; + + RUST_SRC_PATH = pkgs.rustPlatform.rustLibSrc; + }; devShell = with pkgs; mkShell { @@ -32,6 +40,7 @@ libnotify ]; RUST_SRC_PATH = rustPlatform.rustLibSrc; + RUST_BACKTRACE = 1; }; } ); diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 77db547..0000000 --- a/shell.nix +++ /dev/null @@ -1,7 +0,0 @@ -(import ( - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz"; - sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; } -) { - src = ./.; -}).shellNix