Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging

https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
parent e6f1028340 03fb2c1f32
commit d3dc3d4130
239 changed files with 339 additions and 309 deletions
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
    })
  ];

-  outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config
+  outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config

  propagatedBuildInputs = [ freetype ];
  buildInputs = [ pkgconfig expat ];