diff options
author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:44:33 +0000 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:48:16 +0000 |
commit | 007f80c1d0440b89970000b92f78ce76186d99a5 (patch) | |
tree | 4e1b441ae8f3d451ebecde034fd4bc8456286f0c /pkgs/development/libraries/speech-tools | |
parent | d91986c24f1abc34b9785d9e4cd6dbe0bf398853 (diff) | |
download | nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.gz nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.bz2 nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.lz nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.xz nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.zst nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.zip |
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me. Relevant: issue #2999, issue #739
Diffstat (limited to 'pkgs/development/libraries/speech-tools')
-rw-r--r-- | pkgs/development/libraries/speech-tools/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 48168ceb92d..79a633c6541 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , gawk, alsaLib, ncurses , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -28,7 +28,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doUnpack" "killUsrBin" "doConfigure" "doMakeInstall" "doDeploy" "fixPaths"]; - + killUsrBin = a.fullDepEntry '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) @@ -55,7 +55,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -63,4 +63,3 @@ rec { }; }; }) x - |