From f96842292ffae0cbc067e503fe0e75e904da1d05 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 09:57:15 +0200 Subject: [PATCH 1/4] mono: don't propagate a dependency to glib-dev This was added in 2005 back in r51ce4ea2. This was not commented or explained anywhere, and it does not seem to be necessary anymore according to some quick testing I did. Reduces mono closure size by ~100M. --- pkgs/development/compilers/mono/generic.nix | 2 -- 1 file changed, 2 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" From 0cb5116fafd1611b0eabc371098259158a0d89b9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 11:56:33 +0200 Subject: [PATCH 2/4] gio-sharp: add missing glib dependency --- pkgs/development/libraries/gio-sharp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From 8dd26c6d858c57b7e55e4ef685502739c23d40f4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 11:58:12 +0200 Subject: [PATCH 3/4] dotnetPackages.FSharpAutoComplete: add missing glib dependency --- pkgs/top-level/dotnet-packages.nix | 2 ++ 1 file changed, 2 insertions(+) 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 From fb3caa93a4e970412c8aec311b085c65af5e48e1 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 12:56:52 +0200 Subject: [PATCH 4/4] pythonPackages.pythonnet: add missing glib dependency --- pkgs/development/python-modules/pythonnet/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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 ];