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

https://github.com/NixOS/nixpkgs/pull/14766
This commit is contained in:
Tuomas Tynkkynen
2016-08-30 12:43:37 +03:00
239 changed files with 339 additions and 309 deletions

View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1lak3hyvvb0w9avzmf0a8vayb7vqhj4m709q1czlhvgjb15dbcf1";
};
outputs = [ "dev" "out" ];
outputs = [ "out" "dev" ];
outputBin = "dev"; # compilation tools
postInstall = ''

View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g";
};
outputs = [ "dev" "out" "bin" "static" ];
outputs = [ "bin" "dev" "out" "static" ];
postPatch = ''
substituteInPlace Makefile --replace \

View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
outputs = [ "dev" "out" "bin" ];
outputs = [ "bin" "dev" "out" ];
nativeBuildInputs = [ perl texinfo ];