diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-06-11 10:53:11 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 10:53:11 -0300 |
| commit | 7f6f5e06d6d135df8ed6e8374bfee635095fcfe0 (patch) | |
| tree | 3711a62d403899ae8709f83b9ec4349ed98a1b94 /pkgs/desktops | |
| parent | 6bd90a3dc07adc93df35559e166ac3943f9322ea (diff) | |
| parent | c740e2a663f952490b7148741100b2090a0d4a76 (diff) | |
| download | nixlib-7f6f5e06d6d135df8ed6e8374bfee635095fcfe0.tar nixlib-7f6f5e06d6d135df8ed6e8374bfee635095fcfe0.tar.gz nixlib-7f6f5e06d6d135df8ed6e8374bfee635095fcfe0.tar.bz2 nixlib-7f6f5e06d6d135df8ed6e8374bfee635095fcfe0.tar.lz nixlib-7f6f5e06d6d135df8ed6e8374bfee635095fcfe0.tar.xz nixlib-7f6f5e06d6d135df8ed6e8374bfee635095fcfe0.tar.zst nixlib-7f6f5e06d6d135df8ed6e8374bfee635095fcfe0.zip | |
Merge pull request #62617 from alexarice/caja-dropbox
caja-dropbox: fix python dependency
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/mate/caja-dropbox/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch | 11 |
2 files changed, 36 insertions, 7 deletions
diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 411308c488c7..f5b71eba141a 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,31 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, mate, python3Packages }: +{ stdenv, fetchurl, substituteAll +, pkgconfig, gobject-introspection, gdk_pixbuf +, gtk3, mate, python3, dropbox }: +let + dropboxd = "${dropbox}/bin/dropbox"; +in stdenv.mkDerivation rec { - name = "caja-dropbox-${version}"; + pname = "caja-dropbox"; 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 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5"; }; + patches = [ + (substituteAll { + src = ./fix-cli-paths.patch; + inherit dropboxd; + }) + ]; + + strictDeps = true; + nativeBuildInputs = [ pkgconfig + gobject-introspection + gdk_pixbuf + (python3.withPackages (ps: with ps; [ + docutils + pygobject3 + ])) ]; buildInputs = [ gtk3 mate.caja - python3Packages.python - python3Packages.pygtk - python3Packages.docutils + python3 ]; configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ]; meta = with stdenv.lib; { description = "Dropbox extension for Caja file manager"; - homepage = https://github.com/mate-desktop/caja-dropbox; + homepage = "https://github.com/mate-desktop/caja-dropbox"; license = with licenses; [ gpl3 cc-by-nd-30 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch b/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch new file mode 100644 index 000000000000..de591f493f6f --- /dev/null +++ b/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch @@ -0,0 +1,11 @@ +--- a/caja-dropbox.in ++++ b/caja-dropbox.in +@@ -70,7 +70,7 @@ DOWNLOADING = "Downloading Dropbox... %d%%" + UNPACKING = "Unpacking Dropbox... %d%%" + + PARENT_DIR = os.path.expanduser("~") +-DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR ++DROPBOXD_PATH = "@dropboxd@" + DESKTOP_FILE = "@DESKTOP_FILE_DIR@/caja-dropbox.desktop" + + enc = locale.getpreferredencoding() |