From f7d4bc2c7147755d764c792af6f51bc2ffdb71dc Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Mon, 22 Oct 2018 08:42:01 +0000 Subject: [PATCH 1/2] cedille: Apply patch which unbreaks the options file See https://github.com/cedille/cedille/issues/29 --- pkgs/applications/science/logic/cedille/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 5b99a47bb41..b3055688d23 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -1,5 +1,13 @@ { stdenv, lib, fetchFromGitHub, alex, happy, Agda, agdaIowaStdlib, - buildPlatform, buildPackages, ghcWithPackages }: + buildPlatform, buildPackages, ghcWithPackages, fetchpatch }: +let + options-patch = + fetchpatch { + url = https://github.com/cedille/cedille/commit/ee62b0fabde6c4f7299a3778868519255cc4a64f.patch; + name = "options.patch"; + sha256 = "19xzn9sqpfnfqikqy1x9lb9mb6722kbgvrapl6cf8ckcw8cfj8cz"; + }; +in stdenv.mkDerivation rec { version = "1.0.0"; name = "cedille-${version}"; @@ -11,6 +19,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ alex happy Agda (ghcWithPackages (ps: [ps.ieee])) ]; + patches = [options-patch]; + LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc") From 08e5ef20d806c9da8a2471c6417619fd34177399 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Mon, 22 Oct 2018 08:43:07 +0000 Subject: [PATCH 2/2] cedille: Make a seperate output for the base library For now, for normal usage you need to add `${cedille.lib}` to the `~/.cedille/options` file so that cedille will find the base libraries. There is no option to pass options by the command line. --- pkgs/applications/science/logic/cedille/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index b3055688d23..0817ebe0654 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -32,9 +32,12 @@ stdenv.mkDerivation rec { chmod -R 755 ial ''; + outputs = ["out" "lib"]; + installPhase = '' mkdir -p $out/bin mv cedille $out/bin/cedille + mv lib $lib ''; meta = {