Skip to content

Commit 527fc4f

Browse files
committedApr 18, 2024·
feat(nix): Make derivation compatible for use without flakes
1 parent 5e33533 commit 527fc4f

File tree

2 files changed

+28
-23
lines changed

2 files changed

+28
-23
lines changed
 

‎default.nix

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{ pkgs ? import <nixpkgs> { }
2+
, jasminc
3+
}:
4+
with pkgs;
5+
stdenv.mkDerivation {
6+
name = "libjade";
7+
src = ./src;
8+
9+
nativeBuildInputs = with pkgs; [
10+
jasminc
11+
clang
12+
gnumake
13+
];
14+
15+
buildPhase = ''
16+
make FAIL_ON_ERROR=1 -j$(nproc)
17+
'';
18+
19+
installPhase = ''
20+
mkdir -p $out/lib
21+
mkdir -p $out/include
22+
cp libjade.a $out/lib/
23+
cp libjade.h $out/include/
24+
'';
25+
26+
}

‎flake.nix

+2-23
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,10 @@
1818
ec = easycrypt.packages.${system}.default;
1919
in
2020
{
21-
packages.${system}.default = pkgs.stdenv.mkDerivation {
22-
name = "libjade";
23-
src = ./src;
24-
25-
nativeBuildInputs = with pkgs; [
26-
jasminc
27-
clang
28-
gnumake
29-
];
30-
31-
buildPhase = ''
32-
make FAIL_ON_ERROR=1 -j$(nproc)
33-
'';
34-
35-
installPhase = ''
36-
mkdir -p $out/lib
37-
mkdir -p $out/include
38-
cp libjade.a $out/lib/
39-
cp libjade.h $out/include/
40-
'';
41-
42-
};
21+
packages.${system}.default = pkgs.callPackage ./default.nix { inherit pkgs jasminc; };
4322

4423
devShells.${system}.default = pkgs.mkShell {
45-
name = "libjade-ci";
24+
name = "libjade";
4625
src = self.packages.${system}.default.src;
4726

4827
packages = self.packages.${system}.default.nativeBuildInputs ++

0 commit comments

Comments
 (0)
Please sign in to comment.