Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6adf079ce5f1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9de0430aace2
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 15, 2021

  1. eukleides: Fix build, expose tex package

    @SFrijters
    SFrijters committed May 15, 2021
    Copy the full SHA
    30b5330 View commit details

  2. eukleides: Update license 

    See license section in the README.
    @SFrijters
    SFrijters committed May 15, 2021
    Copy the full SHA
    06e7dc2 View commit details

Commits on May 16, 2021

  1. Merge #122322: eukleides: Fix build, expose tex package

    @vcunat
    vcunat committed May 16, 2021
    Copy the full SHA
    9de0430 View commit details
Showing with 40 additions and 12 deletions.
  1. +40 −12 pkgs/applications/science/math/eukleides/default.nix
52 changes: 40 additions & 12 deletions pkgs/applications/science/math/eukleides/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,54 @@
{ lib, stdenv, fetchurl, bison, flex, texinfo, readline, texLive }:
{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }:

let
name = "eukleides";
lib.fix (eukleides: stdenv.mkDerivation rec {
pname = "eukleides";
version = "1.5.4";
in
stdenv.mkDerivation {
name = "${name}-${version}";

src = fetchurl {
url = "http://www.eukleides.org/files/${name}-${version}.tar.bz2";
url = "http://www.eukleides.org/files/${pname}-${version}.tar.bz2";
sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
};

buildInputs = [bison flex texinfo readline texLive];
nativeBuildInputs = [ bison flex texinfo makeWrapper ];

preConfigure = "sed -i 's/ginstall-info/install-info/g' doc/Makefile";
installPhase = "mkdir -p $out/bin ; make PREFIX=$out install";
buildInputs = [ readline texLive ];

preConfigure = ''
substituteInPlace Makefile \
--replace mktexlsr true
substituteInPlace doc/Makefile \
--replace ginstall-info install-info
substituteInPlace Config \
--replace '/usr/local' "$out" \
--replace '$(SHARE_DIR)/texmf' "$tex"
'';

preInstall = ''
mkdir -p $out/bin
'';

postInstall = ''
wrapProgram $out/bin/euktoeps \
--set-default TEXINPUTS : \
--prefix TEXINPUTS : "$tex/tex/latex/eukleides" \
--prefix PATH : "${texLive}/bin"
wrapProgram $out/bin/euktopdf \
--set-default TEXINPUTS : \
--prefix TEXINPUTS : "$tex/tex/latex/eukleides" \
--prefix PATH : "${texLive}/bin"
'';

outputs = [ "out" "doc" "tex" ];

passthru.tlType = "run";
passthru.pkgs = [ eukleides.tex ];

meta = {
description = "Geometry Drawing Language";
homepage = "http://www.eukleides.org/";
license = lib.licenses.gpl2;
license = lib.licenses.gpl3Plus;

longDescription = ''
Eukleides is a computer language devoted to elementary plane
@@ -34,4 +62,4 @@ stdenv.mkDerivation {
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.peti ];
};
}
})