Merge pull request #114976 from siraben/darwin-mass-fix-buildInputs=0

This commit is contained in:
Sandro
2021-03-03 17:58:53 +01:00
committed by GitHub
14 changed files with 27 additions and 18 deletions
+3 -2
View File
@@ -7,8 +7,9 @@ stdenv.mkDerivation rec {
sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi";
};
patchPhase = ''
postPatch = ''
sed -i "Makefile" -e "s|^ *PREFIX *=.*$|PREFIX = $out|g"
substituteInPlace Makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc'
'';
meta = {
@@ -24,6 +25,6 @@ stdenv.mkDerivation rec {
license = "liberal"; # a non-copyleft license, see `Copyright' file
homepage = "http://www.mesa.nl/pub/mpage/";
platforms = lib.platforms.linux;
platforms = lib.platforms.all;
};
}
+5 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchurl, libintl }:
stdenv.mkDerivation rec {
@@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz";
sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47";
};
buildInputs = [ libintl ];
meta = with lib; {
description = ''
A little program that can be used to compare putatively similar files
@@ -18,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.nongnu.org/numdiff/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [];
platforms = platforms.gnu ++ platforms.linux;
platforms = platforms.unix;
};
}
+1 -1
View File
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
similar ASCII characters, e.g. by stripping diacritics.
'';
maintainers = with lib.maintainers; [ goibhniu ];
platforms = lib.platforms.linux;
platforms = lib.platforms.all;
};
}
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
description = "Merge YAML data files";
homepage = "https://github.com/abbradar/yaml-merge";
license = licenses.bsd2;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
}