public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123221 from xworld21/eukleides-use-CC

Browse Source 
eukleides: use $CC instead of hardcoded gcc, build on more platforms
This commit is contained in:
Peter Simons 2021-05-16 16:35:51 +02:00 committed by GitHub
commit 5bf5cb1b1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/science/math/eukleides/default.nix
View File

@ -9,6 +9,9 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
}; };
# use $CC instead of hardcoded gcc
patches = [ ./use-CC.patch ];
nativeBuildInputs = [ bison flex texinfo makeWrapper ]; nativeBuildInputs = [ bison flex texinfo makeWrapper ];
buildInputs = [ readline texLive ]; buildInputs = [ readline texLive ];
@ -59,7 +62,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
circles and conics. circles and conics.
''; '';
platforms = lib.platforms.linux; platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.peti ]; maintainers = [ lib.maintainers.peti ];
}; };
}) })

11
pkgs/applications/science/math/eukleides/use-CC.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/build/Makefile
+++ b/build/Makefile
@@ -11,7 +11,7 @@ LEX = flex
LFLAGS = -8
YACC = bison
YFLAGS = -d
-CC = gcc
+CC ?= gcc
IFLAGS = -I$(COMMON_DIR) -I$(MAIN_DIR) -I$(BUILD_DIR)
ifneq ($(strip $(LOCALES)),)
MOFLAGS = -DMO_DIR=\"$(MO_DIR)\"