From b81e646d9b956d7aacc09bbeb07f9d62e47412c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 8 Jan 2018 14:52:25 -0200 Subject: [PATCH] mate: remove cajaWithExtensions --- pkgs/desktops/mate/caja/cajaWithExtensions.nix | 11 ----------- pkgs/desktops/mate/default.nix | 5 +---- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 pkgs/desktops/mate/caja/cajaWithExtensions.nix diff --git a/pkgs/desktops/mate/caja/cajaWithExtensions.nix b/pkgs/desktops/mate/caja/cajaWithExtensions.nix deleted file mode 100644 index cb315d7f09a..00000000000 --- a/pkgs/desktops/mate/caja/cajaWithExtensions.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ buildEnv, makeWrapper, caja, extensions ? [] }: - -buildEnv { - name = "cajaWithExtensions-${caja.version}"; - meta = caja.meta // { description = "File manager (including extensions) for the MATE desktop"; }; - paths = [ caja ] ++ extensions; - buildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram "$out/bin/caja" --set CAJA_EXTENSION_DIRS "$out/lib/caja/extensions-2.0" - ''; -} diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index e0763725899..0c495fd190e 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -9,9 +9,6 @@ let caja = callPackage ./caja { }; caja-dropbox = callPackage ./caja-dropbox { }; caja-extensions = callPackage ./caja-extensions { }; - cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix { - extensions = [ caja-extensions ]; - }; engrampa = callPackage ./engrampa { }; eom = callPackage ./eom { }; libmatekbd = callPackage ./libmatekbd { }; @@ -69,7 +66,7 @@ let extraPackages = [ atril - cajaWithExtensions + caja-extensions engrampa eom mate-applets