ci: Refactor Nix shell files

piratecash · Jan 29, 2021 · cc2a545 · cc2a545
1 parent 2480e55
commit cc2a545
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/ci/mkshell.nix b/ci/mkshell.nix
@@ -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)
+   '';
+}
diff --git a/ci/shell-i686.nix b/ci/shell-i686.nix
@@ -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; }
diff --git a/ci/shell.nix b/ci/shell.nix
@@ -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; }