summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2018-01-08 14:52:25 -0200
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2018-01-09 02:40:04 +0200
commitb81e646d9b956d7aacc09bbeb07f9d62e47412c5 (patch)
tree85afaa12d1e46b2fc74e15165d599abbdb09ffc3 /pkgs/desktops
parent8b416450ea52aeac584faf190238a4bfd0372cd2 (diff)
downloadnixpkgs-b81e646d9b956d7aacc09bbeb07f9d62e47412c5.tar
nixpkgs-b81e646d9b956d7aacc09bbeb07f9d62e47412c5.tar.gz
nixpkgs-b81e646d9b956d7aacc09bbeb07f9d62e47412c5.tar.bz2
nixpkgs-b81e646d9b956d7aacc09bbeb07f9d62e47412c5.tar.lz
nixpkgs-b81e646d9b956d7aacc09bbeb07f9d62e47412c5.tar.xz
nixpkgs-b81e646d9b956d7aacc09bbeb07f9d62e47412c5.tar.zst
nixpkgs-b81e646d9b956d7aacc09bbeb07f9d62e47412c5.zip
mate: remove cajaWithExtensions
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/mate/caja/cajaWithExtensions.nix11
-rw-r--r--pkgs/desktops/mate/default.nix5
2 files changed, 1 insertions, 15 deletions
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