diff options
| author | Domen Kožar <domen@dev.si> | 2017-07-14 11:55:41 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2017-07-14 11:55:41 +0200 |
| commit | 0eb4f6fd2547442d8c51f73d4fe11225951ee663 (patch) | |
| tree | 1bd0e57c822b27ecffd0270165e0e51be418566a /pkgs/desktops | |
| parent | f93050e509ff9df866f5f53343fbd8967ac8144d (diff) | |
| parent | a889454869e4f7d5ba6067ebcc0ba7fcd26e4417 (diff) | |
| download | nixlib-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar nixlib-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.gz nixlib-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.bz2 nixlib-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.lz nixlib-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.xz nixlib-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.zst nixlib-0eb4f6fd2547442d8c51f73d4fe11225951ee663.zip | |
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417'
Merge staging. It includes fixes for cc-wrapper parsing speed and some other minor things. http://hydra.nixos.org/eval/1375094
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.14/kde-package/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index d5de6f5f6bc1..3637d9f89cb2 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -86,7 +86,7 @@ rec { };}) '' mkdir -pv $out/nix-support - echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages + printLines ${toString list} | tee $out/nix-support/propagated-user-env-packages ''; # Given manifest module data, return the module |