uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, substituteAll
|
||||
, vala
|
||||
, libgee
|
||||
, granite
|
||||
, gtk3
|
||||
, networkmanager
|
||||
, networkmanagerapplet
|
||||
, libnma
|
||||
, switchboard
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-network";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CdSX4p98HQNC0VF5Ae/ZnDqm000+9KJ6JhQWhSHC4CI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit networkmanagerapplet;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
granite
|
||||
gtk3
|
||||
libgee
|
||||
networkmanager
|
||||
libnma
|
||||
switchboard
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Networking Plug";
|
||||
homepage = "https://github.com/elementary/switchboard-plug-network";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala
|
||||
index ba9dc22..a12871a 100644
|
||||
--- a/src/Views/VPNPage.vala
|
||||
+++ b/src/Views/VPNPage.vala
|
||||
@@ -264,7 +264,7 @@ public class Network.VPNPage : Network.Widgets.Page {
|
||||
private void try_connection_editor (string args) {
|
||||
try {
|
||||
var appinfo = AppInfo.create_from_commandline (
|
||||
- "nm-connection-editor %s".printf (args),
|
||||
+ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args),
|
||||
null,
|
||||
GLib.AppInfoCreateFlags.NONE
|
||||
);
|
||||
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
|
||||
index 5849b69..7bbd172 100644
|
||||
--- a/src/Widgets/SettingsButton.vala
|
||||
+++ b/src/Widgets/SettingsButton.vala
|
||||
@@ -55,7 +55,7 @@ public class Network.Widgets.SettingsButton : Gtk.Button {
|
||||
clicked.connect (() => {
|
||||
try {
|
||||
var appinfo = AppInfo.create_from_commandline (
|
||||
- "nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE
|
||||
+ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE
|
||||
);
|
||||
|
||||
appinfo.launch (null, null);
|
||||
Loading…
Add table
Add a link
Reference in a new issue