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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-04-18 13:00:40 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/hunspell/default.nix
View File

@@ -8,8 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7";
};
propagatedBuildInputs = [ ncurses readline ];
configureFlags = "--with-ui --with-readline";
outputs = [ "dev" "out" "bin" "man" ];
buildInputs = [ ncurses readline ];
configureFlags = [ "--with-ui" "--with-readline" ];
hardeningDisable = [ "format" ];

2
pkgs/development/libraries/hunspell/wrapper.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
name = (appendToName "with-dicts" hunspell).name;
buildInputs = [ makeWrapper ];
buildCommand = ''
makeWrapper ${hunspell}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath}
makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath}
'';
inherit (hunspell) meta;
}