# HG changeset patch # User Robin Stumm # Date 1490405956 -3600 # Sat Mar 25 02:39:16 2017 +0100 # Node ID a753c754174399407dfc5d8d85f2f120a0dbd9cc # Parent dd2dbcbe4e923e83cf3933fbb78841a7ac2fb569 new nix build diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -1,13 +1,23 @@ -{ pkgs ? import {}, - rust ? pkgs.rustPlatform }: +{ pkgs ? import {} +, buildRustPackage ? (import (pkgs.fetchFromBitbucket { + owner = "dermetfan"; + repo = "nixpkgs-extras"; + rev = "89ff12eeae4d9f38a3231c2cc1986f7157d374d8"; + sha256 = "15n3919hfs76lqn5gdcfa8plba1di777s23x6yv5a03cjkbnswcw"; + })).buildRustPackage { + inherit pkgs; + } }: -rust.buildRustPackage { +buildRustPackage { name = "cursedlife"; + src = ./.; + buildInputs = with pkgs; [ ncurses ]; - depsSha256 = ""; + + doCheck = true; meta.maintainers = [ "serverkorken@gmail.com" ]; } diff --git a/shell.nix b/shell.nix deleted file mode 100644 --- a/shell.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs ? import {} }: - -pkgs.stdenv.mkDerivation { - name = "cursedlife-env"; - buildInputs = with pkgs; [ - ncurses - ]; - - RUST_BACKTRACE = 1; -}