diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-25 14:05:22 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:21 -0600 |
| commit | 68e0bc38a2cc09985ef5dde22c200010349ed731 (patch) | |
| tree | 5995c59e811188eeb26f2ceb78f88b732876de8c | |
| parent | d446303d0bab3675d1d30fc9a75f17904780c360 (diff) | |
Move kdeWrapper out of kdeFrameworks
| -rw-r--r-- | pkgs/build-support/kde/wrapper.nix (renamed from pkgs/development/libraries/kde-frameworks/kde-wrapper.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/build-support/kde/wrapper.nix index f5add12e8eca2..f5add12e8eca2 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/build-support/kde/wrapper.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 1ce3d62cf1693..c5484dd6e8d44 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -54,10 +54,6 @@ let } // (args.meta or {}); }); - kdeWrapper = import ./kde-wrapper.nix { - inherit stdenv lib makeWrapper buildEnv; - }; - attica = callPackage ./attica.nix {}; baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7edbbf3b1f7f1..15db1a7d7a6b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -271,6 +271,10 @@ with pkgs; kdeDerivation = import ../build-support/kde/derivation.nix { inherit stdenv lib; }; + kdeWrapper = import ../build-support/kde/wrapper.nix { + inherit stdenv lib makeWrapper buildEnv; + }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; |