public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging into master

Browse Source 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
This commit is contained in:
Tuomas Tynkkynen
2016-09-01 13:27:27 +03:00
parent 003ab1d9fd 838c75398c
commit 8c4aeb1780
270 changed files with 460 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/ffmpeg/generic.nix
View File

@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
postPatch = ''patchShebangs .'';
inherit patches;
outputs = [ "dev" "out" "bin" ]
outputs = [ "bin" "dev" "out" ]
++ optional (reqMin "1.0") "doc" ; # just dev-doc
setOutputFlags = false; # doesn't accept all and stores configureFlags in libs!