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

Merge pull request #90288 from delroth/mono-closure-size 

mono: don't propagate a dependency to glib-dev (15% closure size saving)
This commit is contained in:
obadz 2020-06-17 15:03:45 +01:00 committed by GitHub
parent 459cf94991 fb3caa93a4
commit 0280b5e21d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/mono/generic.nix
View File

@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
] ]
++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
propagatedBuildInputs = [glib];
configureFlags = [ configureFlags = [
"--x-includes=${libX11.dev}/include" "--x-includes=${libX11.dev}/include"
"--x-libraries=${libX11.out}/lib" "--x-libraries=${libX11.out}/lib"

4
pkgs/development/libraries/gio-sharp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: { stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gio-sharp"; pname = "gio-sharp";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig autoconf automake which ]; nativeBuildInputs = [ pkgconfig autoconf automake which ];
buildInputs = [ mono gtk-sharp-2_0 ]; buildInputs = [ mono glib gtk-sharp-2_0 ];
dontStrip = true; dontStrip = true;

2
pkgs/development/python-modules/pythonnet/default.nix
View File

@ -9,6 +9,7 @@
, pkgconfig , pkgconfig
, dotnetbuildhelpers , dotnetbuildhelpers
, clang , clang
, glib
, mono , mono
}: }:
@ -63,6 +64,7 @@ buildPythonPackage rec {
]; ];
buildInputs = [ buildInputs = [
glib
mono mono
psutil # needed for memory leak tests psutil # needed for memory leak tests
]; ];

2
pkgs/top-level/dotnet-packages.nix
View File

@ -4,6 +4,7 @@
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, fetchNuGet , fetchNuGet
, glib
, pkgconfig , pkgconfig
, mono , mono
, fsharp , fsharp
@ -544,6 +545,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
buildInputs = [ buildInputs = [
fsharp fsharp
glib
dotnetPackages.FSharpCompilerService dotnetPackages.FSharpCompilerService
dotnetPackages.NewtonsoftJson dotnetPackages.NewtonsoftJson
dotnetPackages.NDeskOptions dotnetPackages.NDeskOptions