public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connman: reverse order of build flavors declaration

Browse Source
This commit is contained in:
Doron Behar 2020-03-04 09:48:01 +02:00
parent 22b27dd635
commit aa44c23c7a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/connman/default.nix
View File

@ -1,6 +1,9 @@
{ callPackage }: { callPackage }:
{ {
# All the defaults
connman = callPackage ./connman.nix { };
connmanFull = callPackage ./connman.nix { connmanFull = callPackage ./connman.nix {
enableNetworkManager = true; enableNetworkManager = true;
enableHh2serialGps = true; enableHh2serialGps = true;
@ -32,7 +35,4 @@
enableClient = false; enableClient = false;
# enableDatafiles = false; # If disabled, configuration and data files are not installed # enableDatafiles = false; # If disabled, configuration and data files are not installed
}; };
# All the defaults
connman = callPackage ./connman.nix { };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -2551,9 +2551,9 @@ in
conspy = callPackage ../os-specific/linux/conspy {}; conspy = callPackage ../os-specific/linux/conspy {};
inherit (callPackage ../tools/networking/connman {}) inherit (callPackage ../tools/networking/connman {})
connman
connmanFull connmanFull
connmanMinimal connmanMinimal
connman
; ;
connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; connman-gtk = callPackage ../tools/networking/connman/connman-gtk { };