Skip to content

Commit

Permalink
ci: Refactor Nix shell files
Browse files Browse the repository at this point in the history
  • Loading branch information
jonasnick authored and real-or-random committed Jan 29, 2021
1 parent 2480e55 commit cc2a545
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
12 changes: 12 additions & 0 deletions ci/mkshell.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{ pkgs }:

with pkgs;

mkShell {
buildInputs = [
bash file pkgconfig autoconf automake libtool gmp valgrind clang gcc
];
shellHook = ''
echo Running nix-shell with nixpkgs version: $(nix eval --raw nixpkgs.lib.version)
'';
}
13 changes: 4 additions & 9 deletions ci/shell-i686.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
with (import <nixpkgs> {}).pkgsi686Linux;
mkShell {
buildInputs = [
bash file pkgconfig autoconf automake libtool gmp valgrind clang gcc
];
shellHook = ''
echo Running nix-shell with nixpkgs version: $(nix eval --raw nixpkgs.lib.version)
'';
}
let
pkgs = (import <nixpkgs> {}).pkgsi686Linux;
in
import ./mkshell.nix { inherit pkgs; }
13 changes: 4 additions & 9 deletions ci/shell.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
with (import <nixpkgs> {});
mkShell {
buildInputs = [
bash file pkgconfig autoconf automake libtool gmp valgrind clang gcc
];
shellHook = ''
echo Running nix-shell with nixpkgs version: $(nix eval --raw nixpkgs.lib.version)
'';
}
let
pkgs = (import <nixpkgs> {});
in
import ./mkshell.nix { inherit pkgs; }

0 comments on commit cc2a545

Please sign in to comment.