diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2017-06-22 02:28:04 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2017-06-22 02:28:04 +0200 |
| commit | 7abb9b349f70d8ce2ae4c7004e59ee9952623c17 (patch) | |
| tree | 89ff4650cb1552af81847f11fa73320c68dee323 /pkgs | |
| parent | 28cbc562e399c37eabfd4760c439a5dfdebefe24 (diff) | |
profpatsch/jmtpfs: Drop vuizvui package
The package fails because the mtp-jolla.patch was already applied upstream, see the following build log: https://headcounter.org/hydra/log/d21f1590i2hs6xhgkdr00906ksnvgxfz-libmtp-1.1.13.drv This is the upstream commit by @Profpatsch that's now part of libmtp version 1.1.13: https://sourceforge.net/p/libmtp/code/ci/8919ebeef58251639454c2394c0274597be3df9c/ Tested by evaluating machines.profpatsch.katara. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/profpatsch/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/profpatsch/patches/mtp-jolla.patch | 34 |
2 files changed, 1 insertions, 43 deletions
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index 62f96e27..5257ff50 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage, haskellPackages, jmtpfs, libmtp, droopy, fetchFromGitHub }: +{ pkgs, callPackage, haskellPackages, droopy, fetchFromGitHub }: { display-infos = callPackage ./display-infos {}; @@ -8,14 +8,6 @@ }; show-qr-code = callPackage ./show-qr-code { }; - jmtpfs = jmtpfs.override { - libmtp = libmtp.overrideDerivation (old: { - patches = old.patches or [] ++ [ - ./patches/mtp-jolla.patch - ]; - }); - }; - backlight = callPackage ./backlight { inherit (pkgs.xorg) xbacklight; }; # patched version of droopy, with javascript user-enhancement diff --git a/pkgs/profpatsch/patches/mtp-jolla.patch b/pkgs/profpatsch/patches/mtp-jolla.patch deleted file mode 100644 index e893d3b7..00000000 --- a/pkgs/profpatsch/patches/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/ |