From 68e0bc38a2cc09985ef5dde22c200010349ed731 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 25 Feb 2017 14:05:22 -0600 Subject: [PATCH] Move kdeWrapper out of kdeFrameworks --- .../kde-wrapper.nix => build-support/kde/wrapper.nix} | 0 pkgs/development/libraries/kde-frameworks/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/{development/libraries/kde-frameworks/kde-wrapper.nix => build-support/kde/wrapper.nix} (100%) diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/build-support/kde/wrapper.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks/kde-wrapper.nix rename to 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 1ce3d62cf16..c5484dd6e8d 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 7edbbf3b1f7..15db1a7d7a6 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;