diff options
| author | obadz <3359345+obadz@users.noreply.github.com> | 2020-06-17 15:03:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 15:03:45 +0100 |
| commit | 0280b5e21dd89b8b6c0ec70847fedd5ae6b7ea28 (patch) | |
| tree | 14b077a75eeb615a46dbb6222e48901fa76e3576 /pkgs | |
| parent | 459cf94991754d391f7808bbc306f52653298ada (diff) | |
| parent | fb3caa93a4e970412c8aec311b085c65af5e48e1 (diff) | |
| download | nixlib-0280b5e21dd89b8b6c0ec70847fedd5ae6b7ea28.tar nixlib-0280b5e21dd89b8b6c0ec70847fedd5ae6b7ea28.tar.gz nixlib-0280b5e21dd89b8b6c0ec70847fedd5ae6b7ea28.tar.bz2 nixlib-0280b5e21dd89b8b6c0ec70847fedd5ae6b7ea28.tar.lz nixlib-0280b5e21dd89b8b6c0ec70847fedd5ae6b7ea28.tar.xz nixlib-0280b5e21dd89b8b6c0ec70847fedd5ae6b7ea28.tar.zst nixlib-0280b5e21dd89b8b6c0ec70847fedd5ae6b7ea28.zip | |
Merge pull request #90288 from delroth/mono-closure-size
mono: don't propagate a dependency to glib-dev (15% closure size saving)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/mono/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gio-sharp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pythonnet/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index f22771a35e9d..e4d99dcec955 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); - propagatedBuildInputs = [glib]; - configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index d7df4ab72127..a19febbfd66e 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -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 { pname = "gio-sharp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoconf automake which ]; - buildInputs = [ mono gtk-sharp-2_0 ]; + buildInputs = [ mono glib gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 0027c8d32a63..82ddb8c810b0 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -9,6 +9,7 @@ , pkgconfig , dotnetbuildhelpers , clang +, glib , mono }: @@ -63,6 +64,7 @@ buildPythonPackage rec { ]; buildInputs = [ + glib mono psutil # needed for memory leak tests ]; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 3b58e1937b60..f14ae3133b8b 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -4,6 +4,7 @@ , fetchurl , fetchFromGitHub , fetchNuGet +, glib , pkgconfig , mono , fsharp @@ -544,6 +545,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ fsharp + glib dotnetPackages.FSharpCompilerService dotnetPackages.NewtonsoftJson dotnetPackages.NDeskOptions |