about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSvein Ove Aas <sveina@gmail.com>2016-05-02 23:09:06 +0100
committerSvein Ove Aas <sveina@gmail.com>2016-05-02 23:09:06 +0100
commit5e0e2e669234e9f14b12c55387848faf9e8fe5a0 (patch)
tree917a9f26cb608dac231036abb8302b03399ce8a7
parent7465bcd67a2177c63adeec66398b1b581260b31e (diff)
downloadnixlib-5e0e2e669234e9f14b12c55387848faf9e8fe5a0.tar
nixlib-5e0e2e669234e9f14b12c55387848faf9e8fe5a0.tar.gz
nixlib-5e0e2e669234e9f14b12c55387848faf9e8fe5a0.tar.bz2
nixlib-5e0e2e669234e9f14b12c55387848faf9e8fe5a0.tar.lz
nixlib-5e0e2e669234e9f14b12c55387848faf9e8fe5a0.tar.xz
nixlib-5e0e2e669234e9f14b12c55387848faf9e8fe5a0.tar.zst
nixlib-5e0e2e669234e9f14b12c55387848faf9e8fe5a0.zip
mono: Update libX11 location
-rw-r--r--pkgs/development/compilers/mono/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 709f0f557889..54e76c731a14 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   # 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}/include --x-libraries=${libX11}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so ${llvmOpts}";
+  configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so ${llvmOpts}";
 
   # Attempt to fix this error when running "mcs --version":
   # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   # http://www.mono-project.com/Config_DllMap
   postBuild = ''
     find . -name 'config' -type f | while read i; do
-        sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i
+        sed -i "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" $i
         sed -i "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" $i
     done
   '';