[ fix ] Nix uses proper version

This commit is contained in:
John Mager 2021-06-28 19:35:54 -04:00 committed by G. Allais
parent f5bcc81115
commit 8638849d26
2 changed files with 8 additions and 2 deletions

View File

@ -11,7 +11,10 @@
let idris2-version = "0.4.0";
in flake-utils.lib.eachDefaultSystem (system:
let pkgs = import nixpkgs { inherit system; };
idris2Pkg = pkgs.callPackage ./nix/package.nix { inherit idris2-version; };
idris2Pkg = pkgs.callPackage ./nix/package.nix {
inherit idris2-version;
srcRev = self.shortRev or "dirty";
};
text-editor = import ./nix/text-editor.nix { inherit pkgs idris-emacs-src idris2Pkg; };
buildIdrisPkg = { projectName, src, idrisLibraries }:
pkgs.callPackage ./nix/buildIdris.nix

View File

@ -6,6 +6,7 @@
, fetchFromGitHub
, makeWrapper
, idris2-version
, srcRev
, racket
, gambit
, nodejs
@ -24,8 +25,10 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.isDarwin [ zsh ];
buildInputs = [ chez gmp ];
prePatch = ''
prePatch = let match = "$\{GIT_SHA1}"; in
''
patchShebangs --build tests
sed 's/${match}/${srcRev}/' -i Makefile
'';
makeFlags = [ "PREFIX=$(out)" ]