diff options
| author | Benjamin Mellor <ben@smokingkangaroo.com> | 2018-01-27 17:30:16 +1100 |
|---|---|---|
| committer | Benjamin Mellor <ben@smokingkangaroo.com> | 2018-01-27 17:30:16 +1100 |
| commit | f2622e6aff3ff69557bd238ed6b0e9c941068884 (patch) | |
| tree | ac2b4495edf447812da8e9999a15359b5e6da7ac | |
| parent | bfc4d04de711799056f5afe067c585fbecf72be8 (diff) | |
| download | nixpkgs-f2622e6aff3ff69557bd238ed6b0e9c941068884.tar nixpkgs-f2622e6aff3ff69557bd238ed6b0e9c941068884.tar.gz nixpkgs-f2622e6aff3ff69557bd238ed6b0e9c941068884.tar.bz2 nixpkgs-f2622e6aff3ff69557bd238ed6b0e9c941068884.tar.lz nixpkgs-f2622e6aff3ff69557bd238ed6b0e9c941068884.tar.xz nixpkgs-f2622e6aff3ff69557bd238ed6b0e9c941068884.tar.zst nixpkgs-f2622e6aff3ff69557bd238ed6b0e9c941068884.zip | |
mono{48,50,54}: make sure configureFlags are used in configurePhase
When copying generic-nix to generic-cmake.nix, an explicit configurePhase was added, but it doesn't use the existing configureFlags. Fixing this allowed removing the postBuild fixup of the path to libgdiplus.so, since the --with-libgdiplus option already handles that.
| -rw-r--r-- | pkgs/development/compilers/mono/generic-cmake.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 7621bd56d47..929d0049138 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 dontDisableStatic = true; - # In fact I think this line does not help at all to what I - # wanted to achieve: have mono to find libgdiplus automatically configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { configurePhase = '' patchShebangs ./ - ./autogen.sh --prefix $out + ./autogen.sh --prefix $out $configureFlags ''; # Attempt to fix this error when running "mcs --version": @@ -58,13 +56,13 @@ stdenv.mkDerivation rec { substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" ''; - # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps + # Fix mono DLLMap so it can find libX11 to run winforms apps + # libgdiplus is correctly handled by the --with-libgdiplus configure flag # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive # http://www.mono-project.com/Config_DllMap postBuild = '' find . -name 'config' -type f | xargs \ - sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ - -e 's#[^"]*libgdiplus[^"]*"#${libgdiplus}/lib/libgdiplus.so"#' \ + sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" ''; # Without this, any Mono application attempting to open an SSL connection will throw with |