@@ -95,11 +95,6 @@ libNixName "jpeg" = return "libjpeg"
95libNixName "jvm" = return "jdk"
95libNixName "jvm" = return "jdk"
96libNixName "lapack" = return "liblapack"
96libNixName "lapack" = return "liblapack"
97libNixName "ldap" = return "openldap"
97libNixName "ldap" = return "openldap"
98−libNixName "llvm-3.0" = return "llvm"
99−libNixName "llvm-3.5" = return "llvm"
100−libNixName "llvm-3.6" = return "llvm"
101−libNixName "llvm-3.7" = return "llvm"
102−libNixName "llvm-3.8" = return "llvm"
103libNixName "libavutil" = return "ffmpeg"
98libNixName "libavutil" = return "ffmpeg"
104libNixName "libglade-2.0" = return "libglade"
99libNixName "libglade-2.0" = return "libglade"
105libNixName "libgsasl" = return "gsasl"
100libNixName "libgsasl" = return "gsasl"
@@ -113,6 +108,11 @@ libNixName "libusb-1.0" = return "libusb"
113libNixName "libxml-2.0" = return "libxml2"
108libNixName "libxml-2.0" = return "libxml2"
114libNixName "libzip" = return "libzip"
109libNixName "libzip" = return "libzip"
115libNixName "libzmq" = return "zeromq"
110libNixName "libzmq" = return "zeromq"
111+libNixName "llvm-3.0" = return "llvm"
112+libNixName "llvm-3.5" = return "llvm"
113+libNixName "llvm-3.6" = return "llvm"
114+libNixName "llvm-3.7" = return "llvm"
115+libNixName "llvm-3.8" = return "llvm"
116libNixName "m" = [] -- in stdenv
116libNixName "m" = [] -- in stdenv
117libNixName "magic" = return "file"
117libNixName "magic" = return "file"
118libNixName "MagickWand" = return "imagemagick"
118libNixName "MagickWand" = return "imagemagick"