diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2019-06-11 10:54:40 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-11 10:54:40 -0300 |
commit | 7383bf52a04eaff0817a8686751a8dffd4a236a8 (patch) | |
tree | bedaa8cd7882434a54f39abecb7c5eea91d7f439 /pkgs/desktops/mate | |
parent | 7f6f5e06d6d135df8ed6e8374bfee635095fcfe0 (diff) | |
parent | 03f48ebe2d4300459e62baf0d52c61075bcb342a (diff) | |
download | nixlib-7383bf52a04eaff0817a8686751a8dffd4a236a8.tar nixlib-7383bf52a04eaff0817a8686751a8dffd4a236a8.tar.gz nixlib-7383bf52a04eaff0817a8686751a8dffd4a236a8.tar.bz2 nixlib-7383bf52a04eaff0817a8686751a8dffd4a236a8.tar.lz nixlib-7383bf52a04eaff0817a8686751a8dffd4a236a8.tar.xz nixlib-7383bf52a04eaff0817a8686751a8dffd4a236a8.tar.zst nixlib-7383bf52a04eaff0817a8686751a8dffd4a236a8.zip |
Merge pull request #62609 from alexarice/caja-with-extensions
caja-with-extensions: init
Diffstat (limited to 'pkgs/desktops/mate')
-rw-r--r-- | pkgs/desktops/mate/caja-with-extensions/default.nix | 20 | ||||
-rw-r--r-- | pkgs/desktops/mate/caja/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/mate/default.nix | 5 |
3 files changed, 25 insertions, 4 deletions
diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix new file mode 100644 index 000000000000..35e3cd198f6b --- /dev/null +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ] }: + +stdenv.mkDerivation { + pname = "${caja.pname}-with-extensions"; + version = caja.version; + + phases = [ "installPhase" ]; + + nativeBuildInputs = [ makeWrapper ]; + + inherit caja; + + installPhase = '' + mkdir -p $out/bin + makeWrapper $caja/bin/caja $out/bin/caja \ + --set CAJA_EXTENSION_DIRS ${lib.concatMapStringsSep ":" (x: "${x.outPath}/lib/caja/extensions-2.0") extensions} + ''; + + inherit (caja.meta); +} diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index fcb903f703e7..667a73eb6307 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "caja-${version}"; + pname = "caja"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "10b7yjimblymp1fpsrl4jb2k7kbhla2izsj3njfmg2n6fv9fy9iv"; }; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 3cab936b92b1..f4f2b3620e71 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -4,11 +4,12 @@ let callPackage = newScope self; self = rec { - + atril = callPackage ./atril { }; caja = callPackage ./caja { }; caja-dropbox = callPackage ./caja-dropbox { }; caja-extensions = callPackage ./caja-extensions { }; + caja-with-extensions = callPackage ./caja-with-extensions { }; engrampa = callPackage ./engrampa { }; eom = callPackage ./eom { }; libmatekbd = callPackage ./libmatekbd { }; @@ -86,7 +87,7 @@ let mozo pluma ]; - + }; in self |