Skip to content

Commit

Permalink
Cleaned up nix expressions
Browse files Browse the repository at this point in the history
  • Loading branch information
lukego committed Mar 20, 2017
1 parent 82487c7 commit 398bd28
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
8 changes: 3 additions & 5 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
#
# See README.md for usage instructions.

args @ {
pkgs ? (import ./pkgs.nix) {}
, source ? ./.
, version ? "dev"
}:
{ pkgs ? (import ./pkgs.nix) {}
, source ? pkgs.lib.cleanSource ./.
, version ? "dev" }:

let
callPackage = (pkgs.lib.callPackageWith { inherit pkgs; inherit source; inherit version; });
Expand Down
13 changes: 2 additions & 11 deletions raptorjit.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
# default.nix - define the build environment for RaptorJIT
#
# This file can be used by 'nix-build' or 'nix-shell' to create a
# pristine build environment with precisely the expected software in
# $PATH. This makes it possible to build raptorjit in the same way on
# any machine.
#
# See README.md for usage instructions.
# raptorjit.nix - compile RaptorJIT with reference toolchain

{ pkgs ? (import ./pkgs.nix) {}
, source ? ./.
, version ? "dev" }:
{ pkgs, source, version }:

with pkgs;
with llvmPackages_4.stdenv; # Use clang 4.0
Expand Down

0 comments on commit 398bd28

Please sign in to comment.