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
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
  '';

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
    ++ stdenv.lib.optionals valaSupport [ vala_0_32 ];