about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincenzo Mantova <xworld21@users.sf.net>2021-05-23 19:05:26 +0100
committerVincenzo Mantova <xworld21@users.sf.net>2021-06-21 08:17:11 +0100
commitb0c6bd9211ee7a35d27a0037b388742960c3df71 (patch)
tree8a7bb5e1cf55c8c4fc31cb5a40d4da015fc6b92a
parentb88e8d999c52d0cdff3bb3283f85b500b7c0832e (diff)
downloadnixlib-b0c6bd9211ee7a35d27a0037b388742960c3df71.tar
nixlib-b0c6bd9211ee7a35d27a0037b388742960c3df71.tar.gz
nixlib-b0c6bd9211ee7a35d27a0037b388742960c3df71.tar.bz2
nixlib-b0c6bd9211ee7a35d27a0037b388742960c3df71.tar.lz
nixlib-b0c6bd9211ee7a35d27a0037b388742960c3df71.tar.xz
nixlib-b0c6bd9211ee7a35d27a0037b388742960c3df71.tar.zst
nixlib-b0c6bd9211ee7a35d27a0037b388742960c3df71.zip
eukleides: depend on texinfo4 instead of overriding texinfo
-rw-r--r--pkgs/applications/science/math/eukleides/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix
index 12226abdfca4..6b6bfd7d6e5f 100644
--- a/pkgs/applications/science/math/eukleides/default.nix
+++ b/pkgs/applications/science/math/eukleides/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, getopt, readline, texlive }:
+{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo4, getopt, readline, texlive }:
 
 lib.fix (eukleides: stdenv.mkDerivation rec {
   pname = "eukleides";
@@ -16,7 +16,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
     ./gs-allowpstransparency.patch
   ];
 
-  nativeBuildInputs = [ bison flex texinfo makeWrapper ];
+  nativeBuildInputs = [ bison flex texinfo4 makeWrapper ];
 
   buildInputs = [ getopt readline ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5506ab5caad..a4f5a7f7e3f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29827,9 +29827,7 @@ in
 
   ecm = callPackage ../applications/science/math/ecm { };
 
-  eukleides = callPackage ../applications/science/math/eukleides {
-    texinfo = texinfo4;
-  };
+  eukleides = callPackage ../applications/science/math/eukleides { };
 
   form = callPackage ../applications/science/math/form { };