deepin.dde-network-utils: init at 0.1.2

This commit is contained in:
José Romildo Malaquias 2018-11-14 12:32:51 -02:00
parent 014196b7db
commit 93f3b7e244
3 changed files with 79 additions and 1 deletions

View File

@ -0,0 +1,54 @@
{ stdenv, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools,
dde-qt-dbus-factory, proxychains, which, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-network-utils";
version = "0.1.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1m6njld06yphppyyhygz8mv4gvq2zw0676pbls9m3fs7b3dl56sv";
};
nativeBuildInputs = [
qmake
pkgconfig
qttools
deepin.setupHook
];
buildInputs = [
dde-qt-dbus-factory
proxychains
which
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit which proxychains;
})
];
postPatch = ''
searchHardCodedPaths # for debugging
patchShebangs translate_generation.sh
'';
postFixup = ''
searchHardCodedPaths $out # for debugging
'';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {
description = "Deepin network utils";
homepage = https://github.com/linuxdeepin/dde-network-utils;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

View File

@ -0,0 +1,23 @@
diff -ur dde-network-utils-master.orig/dde-network-utils.pro dde-network-utils-master/dde-network-utils.pro
--- dde-network-utils-master.orig/dde-network-utils.pro 2019-04-04 03:37:46.000000000 -0300
+++ dde-network-utils-master/dde-network-utils.pro 2019-04-07 05:56:28.283195087 -0300
@@ -52,6 +52,7 @@
QMAKE_PKGCONFIG_NAME = libddenetworkutils
QMAKE_PKGCONFIG_DESCRIPTION = libddenetworkutils
+QMAKE_PKGCONFIG_PREFIX = $$PREFIX
QMAKE_PKGCONFIG_INCDIR = $$includes.path
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
diff -ur dde-network-utils-master.orig/networkworker.cpp dde-network-utils-master/networkworker.cpp
--- dde-network-utils-master.orig/networkworker.cpp 2019-04-04 03:37:46.000000000 -0300
+++ dde-network-utils-master/networkworker.cpp 2019-04-07 05:54:28.656479216 -0300
@@ -80,7 +80,7 @@
}
}
- const bool isAppProxyVaild = QProcess::execute("which", QStringList() << "/usr/bin/proxychains4") == 0;
+ const bool isAppProxyVaild = QProcess::execute("@which@/bin/which", QStringList() << "@proxychains@/bin/proxychains4") == 0;
m_networkModel->onAppProxyExistChanged(isAppProxyVaild);
}

View File

@ -17,6 +17,7 @@ let
go = go_1_11;
};
dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-network-utils = callPackage ./dde-network-utils { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };
@ -38,8 +39,8 @@ let
deepin-wm = callPackage ./deepin-wm { };
dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
dtkcore = callPackage ./dtkcore { };
dtkwm = callPackage ./dtkwm { };
dtkwidget = callPackage ./dtkwidget { };
dtkwm = callPackage ./dtkwm { };
go-dbus-factory = callPackage ./go-dbus-factory { };
go-dbus-generator = callPackage ./go-dbus-generator { };
go-gir-generator = callPackage ./go-gir-generator { };