Merge 'staging' into closure-size

- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.

1 files changed, 1 insertions, 1 deletions

diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 8884546bcdf..025be200959 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.ijg.org/;
     description = "A library that implements the JPEG image file format";
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }