From 5da372c36edb1e36db7ef392d4642b935a591d9a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Nov 2016 07:25:51 -0600 Subject: [PATCH] remove kdeEnv --- .../libraries/kde-frameworks/default.nix | 5 --- .../libraries/kde-frameworks/kde-env.nix | 31 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kde-env.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index b69e79fd000..1ef8207e50a 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -56,11 +56,6 @@ let } // (args.meta or {}); }); - kdeEnv = import ./kde-env.nix { - inherit (pkgs) stdenv lib; - inherit (pkgs.xorg) lndir; - }; - kdeWrapper = import ./kde-wrapper.nix { inherit (pkgs) stdenv lib makeWrapper; }; diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix deleted file mode 100644 index 5ddf89a0129..00000000000 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, lndir }: - -drv: pkgs: - -stdenv.mkDerivation { - name = "kde-env-${drv.name}"; - nativeBuildInputs = [ lndir ]; - envPkgs = builtins.map lib.getBin ([drv] ++ pkgs); - unpackPhase = "true"; - configurePhase = "runHook preConfigure; runHook postConfigure"; - buildPhase = "true"; - installPhase = '' - runHook preInstall - - propagated="" - for i in $envPkgs; do - findInputs $i propagated propagated-user-env-packages - done - - for tgt in bin etc/xdg lib/libexec lib/qt5 share; do - mkdir -p "$out/$tgt" - for p in $propagated; do - if [ -d "$p/$tgt" ]; then - lndir -silent "$p/$tgt" "$out/$tgt" >/dev/null 2>&1 - fi - done - done - - runHook postInstall - ''; -}