reworked patches

lincense free -> unfree
enabled parallel build

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
This commit is contained in:
Michal Minář 2019-06-25 04:23:47 +02:00
parent 6877159dc0
commit a2585fff23
3 changed files with 45 additions and 11 deletions

View file

@ -64,22 +64,22 @@ stdenv.mkDerivation rec {
wget
];
patchPhase = ''
patches = [
# Distro and version targets attempt to use lsb_release which is broken
# (see issue: https://github.com/NixOS/nixpkgs/issues/22729)
./noinstall-distro-version.patch
# megasync target is not part of the install rule thanks to a commented block
./install-megasync.patch
];
postPatch = ''
for file in $(find src/ -type f \( -iname configure -o -iname \*.sh \) ); do
substituteInPlace "$file" --replace "/bin/bash" "${stdenv.shell}"
done
# Distro and version targets attempt to use lsb_release which is broken
# (see issue: https://github.com/NixOS/nixpkgs/issues/22729)
substituteInPlace src/MEGASync/platform/platform.pri \
--replace "INSTALLS += distro" "# INSTALLS += distro"
# megasync target is not part of the install rule thanks to a commented block
sed -i '/#\s*isEmpty(PREFIX)/,/#\s*INSTALLS\s*+=\s*target/s/^\s*#//' \
src/MEGASync/MEGASync.pro
'';
dontUseQmakeConfigure = true;
enableParallelBuilding = true;
preConfigure = ''
cd src/MEGASync/mega
@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Easy automated syncing between your computers and your MEGA Cloud Drive";
homepage = https://mega.nz/;
license = licenses.free;
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.michojel ];
};

View file

@ -0,0 +1,21 @@
Index: source/src/MEGASync/MEGASync.pro
===================================================================
--- source.orig/src/MEGASync/MEGASync.pro
+++ source/src/MEGASync/MEGASync.pro
@@ -28,11 +28,11 @@ unix:!macx {
TARGET = megasync
# Uncomment the following if "make install" doesn't copy megasync in /usr/bin directory
-# isEmpty(PREFIX) {
-# PREFIX = /usr
-# }
-# target.path = $$PREFIX/bin
-# INSTALLS += target
+ isEmpty(PREFIX) {
+ PREFIX = /usr
+ }
+ target.path = $$PREFIX/bin
+ INSTALLS += target
}
else {
TARGET = MEGAsync

View file

@ -0,0 +1,13 @@
Index: source/src/MEGASync/platform/platform.pri
===================================================================
--- source.orig/src/MEGASync/platform/platform.pri
+++ source/src/MEGASync/platform/platform.pri
@@ -37,7 +37,7 @@ unix:!macx {
system(command -v lsb_release): version.commands = lsb_release -rs > $$version.target
version.files = $$version.target
- INSTALLS += distro version
+ # INSTALLS += distro version
QT += dbus
SOURCES += $$PWD/linux/LinuxPlatform.cpp \