diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-16 18:32:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-16 18:32:41 +0000 |
| commit | 8c6d8191436912231312b7b12f0cefc3fc7fb18a (patch) | |
| tree | cecdc050ac17cbf0bea24282877c63a4c2b8e699 /pkgs/applications/science | |
| parent | 684991c6965ed6310b06cfabcd167525448c7cda (diff) | |
| parent | 805825cc524058526e3a5b9d1583ba317319fe2a (diff) | |
| download | nixpkgs-8c6d8191436912231312b7b12f0cefc3fc7fb18a.tar nixpkgs-8c6d8191436912231312b7b12f0cefc3fc7fb18a.tar.gz nixpkgs-8c6d8191436912231312b7b12f0cefc3fc7fb18a.tar.bz2 nixpkgs-8c6d8191436912231312b7b12f0cefc3fc7fb18a.tar.lz nixpkgs-8c6d8191436912231312b7b12f0cefc3fc7fb18a.tar.xz nixpkgs-8c6d8191436912231312b7b12f0cefc3fc7fb18a.tar.zst nixpkgs-8c6d8191436912231312b7b12f0cefc3fc7fb18a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
3 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 50d0aa6f9d1..620ccfb084e 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -15,7 +15,7 @@ propagatedBuildInputs = with python3Packages; [ pyqt5 lxml - sip + sip_4 ]; preBuild = '' make qt5py3 diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index fe498fdbd8a..b5a9fc3fa86 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -9,6 +9,9 @@ lib.fix (eukleides: stdenv.mkDerivation rec { sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; }; + # use $CC instead of hardcoded gcc + patches = [ ./use-CC.patch ]; + nativeBuildInputs = [ bison flex texinfo makeWrapper ]; buildInputs = [ readline texLive ]; @@ -59,7 +62,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec { circles and conics. ''; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/pkgs/applications/science/math/eukleides/use-CC.patch b/pkgs/applications/science/math/eukleides/use-CC.patch new file mode 100644 index 00000000000..08bd71ec9dc --- /dev/null +++ b/pkgs/applications/science/math/eukleides/use-CC.patch @@ -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)\" |