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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2021-03-18 13:35:59 +01:00
parent c31077a602 de4012ac80
commit 0136206b12
206 changed files with 3936 additions and 1371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/clean/default.nix
View File

@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "clean-3.0";
pname = "clean";
version = "3.0";
src =
if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
@@ -45,8 +46,8 @@ stdenv.mkDerivation {
'';
homepage = "http://wiki.clean.cs.ru.nl/Clean";
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.kkallio ];
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.erin ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

4
pkgs/development/compilers/gnu-smalltalk/default.nix
View File

@@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, pkg-config, libtool
, zip, libffi, libsigsegv, readline, gmp
, gnutls, gnome2, cairo, SDL, sqlite
, gnutls, gtk2, cairo, SDL, sqlite
, emacsSupport ? config.emacsSupport or false, emacs ? null }:
assert emacsSupport -> (emacs != null);
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
# http://smalltalk.gnu.org/download
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
libtool zip libffi libsigsegv-shared readline gmp gnutls gtk2
cairo SDL sqlite
]
++ lib.optional emacsSupport emacs;

4
pkgs/development/compilers/go/binary.nix
View File

@@ -8,8 +8,8 @@ let
"i686" = "386";
"x86_64" = "amd64";
"aarch64" = "arm64";
"armv6l" = "arm";
"armv7l" = "arm";
"armv6l" = "armv6l";
"armv7l" = "armv6l";
"powerpc64le" = "ppc64le";
}.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}");

5
pkgs/development/compilers/xa/dxa.nix
View File

@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
dontConfigure = true;
postPatch = ''
substituteInPlace \
--replace "CC = gcc" "CC = cc' \
Makefile
substituteInPlace Makefile \
--replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc"
'';
installPhase = ''

9
pkgs/development/compilers/xa/xa.nix
View File

@@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
dontConfigure = true;
postPatch = ''
substitueInPlace \
substituteInPlace Makefile \
--replace "DESTDIR" "PREFIX" \
--replace "CC = gcc" "CC = cc" \
--replace "LDD = gcc" "LDD = ld" \
--replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \
--replace "LDD = gcc" "LDD = ${stdenv.cc.targetPrefix}cc" \
--replace "CFLAGS = -O2" "CFLAGS ?=" \
--replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" \
Makefile
--replace "LDFLAGS = -lc" "LDFLAGS ?= -lc"
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];