From 145a8be2b22a3a0459a46e70e8b5d8f4ecc701aa Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Apr 2017 21:22:42 +0200
Subject: pkgs: Move jmtpfs to pkgs/profpatsch

This clearly is something currently only @Profpatsch wants, so lets move
it into the user namespace.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
---
 machines/profpatsch/katara.nix          |  2 +-
 pkgs/default.nix                        | 13 ++++++++-----
 pkgs/mtp-jolla.patch                    | 34 ---------------------------------
 pkgs/profpatsch/patches/mtp-jolla.patch | 34 +++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/mtp-jolla.patch
 create mode 100644 pkgs/profpatsch/patches/mtp-jolla.patch

diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index e407400f..9391bd1e 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -88,7 +88,7 @@ in {
         atool               # archive tools
         gnupg gnupg1compat  # PGP encryption
         imagemagick         # image conversion
-        pkgs.vuizvui.jmtpfs # MTP fuse
+        pkgs.vuizvui.profpatsch.jmtpfs # MTP fuse
         mosh                # ssh with stable connections
         nfs-utils           # the filesystem of the future for 20 years
         sshfsFuse           # mount ssh machines
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 1c9b40cb..4ed83914 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -12,11 +12,6 @@ let
     axbo = callPackage ./axbo { };
     git-detach = callPackage ./git-detach { };
     grandpa = callPackage ./grandpa { };
-    jmtpfs = pkgs.jmtpfs.override {
-      libmtp = pkgs.libmtp.overrideDerivation (old: {
-        patches = old.patches or [] ++ [ ./mtp-jolla.patch ];
-      });
-    };
     nixops = callPackage ./nixops { };
     librxtx_java = callPackage ./librxtx-java { };
     list-gamecontrollers = callPackage ./list-gamecontrollers { };
@@ -45,6 +40,14 @@ let
         inherit (pkgs.haskellPackages) ghcWithPackages;
       };
 
+      jmtpfs = pkgs.jmtpfs.override {
+        libmtp = pkgs.libmtp.overrideDerivation (old: {
+          patches = old.patches or [] ++ [
+            ./profpatsch/patches/mtp-jolla.patch
+          ];
+        });
+      };
+
       # patched version of droopy, with javascript user-enhancement
       droopy = pkgs.droopy.overrideDerivation (old: {
         src = pkgs.fetchFromGitHub {
diff --git a/pkgs/mtp-jolla.patch b/pkgs/mtp-jolla.patch
deleted file mode 100644
index e893d3b7..00000000
--- a/pkgs/mtp-jolla.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/music-players.h b/src/music-players.h
-index a44460a..d05f52f 100644
---- a/src/music-players.h
-+++ b/src/music-players.h
-@@ -3102,6 +3102,16 @@
-   { "Jolla", 0x2931, "Sailfish (ID1)", 0x0a01,
-       DEVICE_FLAGS_ANDROID_BUGS },
- 
-+  /* In update 4 the order of devices was changed for
-+     better OS X / Windows suport and another device-id
-+     got assigned for the MTP */
-+  { "Jolla", 0x2931, "Sailfish (ID2)", 0x0a05,
-+      DEVICE_FLAGS_ANDROID_BUGS },
-+
-+  /* In a later version, the ID changed again. */
-+  { "Jolla", 0x2931, "Sailfish (ID3)", 0x0a07,
-+      DEVICE_FLAGS_ANDROID_BUGS },
-+
-   /*
-    * TCL? Alcatel?
-    */
-@@ -3129,12 +3139,6 @@
-   { "DigiLand", 0x1f3a, "DL701Q", 0x0c02,
-       DEVICE_FLAGS_ANDROID_BUGS },
- 
--  /* In update 4 the order of devices was changed for
--     better OS X / Windows suport and another device-id
--     got assigned for the MTP */
--  { "Jolla", 0x2931, "Sailfish (ID2)", 0x0a05,
--      DEVICE_FLAGS_ANDROID_BUGS },
--
-   /*
-    * bq
-    * https://sourceforge.net/p/libmtp/feature-requests/128/
diff --git a/pkgs/profpatsch/patches/mtp-jolla.patch b/pkgs/profpatsch/patches/mtp-jolla.patch
new file mode 100644
index 00000000..e893d3b7
--- /dev/null
+++ b/pkgs/profpatsch/patches/mtp-jolla.patch
@@ -0,0 +1,34 @@
+diff --git a/src/music-players.h b/src/music-players.h
+index a44460a..d05f52f 100644
+--- a/src/music-players.h
++++ b/src/music-players.h
+@@ -3102,6 +3102,16 @@
+   { "Jolla", 0x2931, "Sailfish (ID1)", 0x0a01,
+       DEVICE_FLAGS_ANDROID_BUGS },
+ 
++  /* In update 4 the order of devices was changed for
++     better OS X / Windows suport and another device-id
++     got assigned for the MTP */
++  { "Jolla", 0x2931, "Sailfish (ID2)", 0x0a05,
++      DEVICE_FLAGS_ANDROID_BUGS },
++
++  /* In a later version, the ID changed again. */
++  { "Jolla", 0x2931, "Sailfish (ID3)", 0x0a07,
++      DEVICE_FLAGS_ANDROID_BUGS },
++
+   /*
+    * TCL? Alcatel?
+    */
+@@ -3129,12 +3139,6 @@
+   { "DigiLand", 0x1f3a, "DL701Q", 0x0c02,
+       DEVICE_FLAGS_ANDROID_BUGS },
+ 
+-  /* In update 4 the order of devices was changed for
+-     better OS X / Windows suport and another device-id
+-     got assigned for the MTP */
+-  { "Jolla", 0x2931, "Sailfish (ID2)", 0x0a05,
+-      DEVICE_FLAGS_ANDROID_BUGS },
+-
+   /*
+    * bq
+    * https://sourceforge.net/p/libmtp/feature-requests/128/
-- 
cgit 1.4.1