From 1bc5ddcff4071394a793320f7cc1d7b5766c6c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 12 Jan 2023 18:32:26 +0100 Subject: [PATCH] agdaPackages.cubical: clean up - use `C.UTF-8` so that we don't have to depend on glibcLocales - remove now unnecessary AGDA_EXEC - run pre/post-build hooks - add ncfavier as maintainer --- pkgs/development/libraries/agda/cubical/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index e4801fbda8e3..a69edded5b3d 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }: +{ lib, mkDerivation, fetchFromGitHub, ghc }: mkDerivation rec { pname = "cubical"; @@ -11,15 +11,15 @@ mkDerivation rec { hash = "sha256-bnHz5uZXZnn1Zd36tq/veA4yT7dhJ1c+AYpgdDfSRzE="; }; - LC_ALL = "en_US.UTF-8"; - - preConfigure = ''export AGDA_EXEC=agda''; + LC_ALL = "C.UTF-8"; # The cubical library has several `Everything.agda` files, which are # compiled through the make file they provide. - nativeBuildInputs = [ ghc glibcLocales ]; + nativeBuildInputs = [ ghc ]; buildPhase = '' + runHook preBuild make + runHook postBuild ''; meta = with lib; { @@ -28,6 +28,6 @@ mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ alexarice ryanorendorff ]; + maintainers = with maintainers; [ alexarice ryanorendorff ncfavier ]; }; }