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
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
  propagatedBuildInputs = optional wantPS ps;

  CMAKE_PREFIX_PATH = concatStringsSep ":"
-    (concatMap (p: [ p p.out ]) buildInputs);
+    (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs);

  configureFlags =
    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"