diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2017-04-23 21:22:42 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2017-04-23 23:08:02 +0200 |
| commit | 145a8be2b22a3a0459a46e70e8b5d8f4ecc701aa (patch) | |
| tree | c28e953898f3693fd5268309760c34b84e2fdfb1 | |
| parent | 1926cde7b0b6bf50870d59e8f6485a272d3ddf97 (diff) | |
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
| -rw-r--r-- | machines/profpatsch/katara.nix | 2 | ||||
| -rw-r--r-- | pkgs/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/profpatsch/patches/mtp-jolla.patch (renamed from pkgs/mtp-jolla.patch) | 0 |
3 files changed, 9 insertions, 6 deletions
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/profpatsch/patches/mtp-jolla.patch index e893d3b7..e893d3b7 100644 --- a/pkgs/mtp-jolla.patch +++ b/pkgs/profpatsch/patches/mtp-jolla.patch |