Merge pull request #155129 from sei40kr/init-nwg-bar

nwg-bar: init at unstable-2021-09-23

authored by

Jonas Heinrich and committed by
GitHub
07dc8ecd 6aea0281

+88
+39
pkgs/applications/misc/nwg-bar/default.nix
···
··· 1 + { lib, buildGoModule, fetchFromGitHub, pkg-config, gtk3, gtk-layer-shell }: 2 + 3 + buildGoModule rec { 4 + pname = "nwg-bar"; 5 + version = "unstable-2021-09-23"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "nwg-piotr"; 9 + repo = pname; 10 + rev = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5"; 11 + sha256 = "sha256-piysF19WDjb/EGI9MBepYrOrQL9C1fsoq05AP8CYN58="; 12 + }; 13 + 14 + patches = [ ./fix-paths.patch ]; 15 + postPatch = '' 16 + substituteInPlace config/bar.json --subst-var out 17 + substituteInPlace tools.go --subst-var out 18 + ''; 19 + 20 + vendorSha256 = "sha256-dgOwflNRb+11umFykozL8DQ50dLbhbMCmCyKmLlW7rw="; 21 + 22 + nativeBuildInputs = [ pkg-config ]; 23 + 24 + buildInputs = [ gtk3 gtk-layer-shell ]; 25 + 26 + preInstall = '' 27 + mkdir -p $out/share/nwg-bar 28 + cp -r config/* images $out/share/nwg-bar 29 + ''; 30 + 31 + meta = with lib; { 32 + description = 33 + "GTK3-based button bar for sway and other wlroots-based compositors"; 34 + homepage = "https://github.com/nwg-piotr/nwg-bar"; 35 + license = licenses.mit; 36 + platforms = platforms.linux; 37 + maintainers = with maintainers; [ sei40kr ]; 38 + }; 39 + }
+47
pkgs/applications/misc/nwg-bar/fix-paths.patch
···
··· 1 + diff --git a/config/bar.json b/config/bar.json 2 + index 6c456e7..98527cb 100644 3 + --- a/config/bar.json 4 + +++ b/config/bar.json 5 + @@ -2,21 +2,21 @@ 6 + { 7 + "label": "Lock", 8 + "exec": "swaylock -f -c 000000", 9 + - "icon": "/usr/share/nwg-bar/images/system-lock-screen.svg" 10 + + "icon": "@out@/share/nwg-bar/images/system-lock-screen.svg" 11 + }, 12 + { 13 + "label": "Logout", 14 + "exec": "swaymsg exit", 15 + - "icon": "/usr/share/nwg-bar/images/system-log-out.svg" 16 + + "icon": "@out@/share/nwg-bar/images/system-log-out.svg" 17 + }, 18 + { 19 + "label": "Reboot", 20 + "exec": "systemctl reboot", 21 + - "icon": "/usr/share/nwg-bar/images/system-reboot.svg" 22 + + "icon": "@out@/share/nwg-bar/images/system-reboot.svg" 23 + }, 24 + { 25 + "label": "Shutdown", 26 + "exec": "systemctl -i poweroff", 27 + - "icon": "/usr/share/nwg-bar/images/system-shutdown.svg" 28 + + "icon": "@out@/share/nwg-bar/images/system-shutdown.svg" 29 + } 30 + ] 31 + \ No newline at end of file 32 + diff --git a/tools.go b/tools.go 33 + index f97751e..987163e 100644 34 + --- a/tools.go 35 + +++ b/tools.go 36 + @@ -45,10 +45,7 @@ func configDir() string { 37 + } 38 + 39 + func getDataHome() string { 40 + - if os.Getenv("XDG_DATA_HOME") != "" { 41 + - return os.Getenv("XDG_DATA_HOME") 42 + - } 43 + - return "/usr/share/" 44 + + return "@out@/share/" 45 + } 46 + 47 + func createDir(dir string) {
+2
pkgs/top-level/all-packages.nix
··· 29655 29656 novnc = callPackage ../applications/networking/novnc { }; 29657 29658 nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; 29659 29660 nwg-launchers = callPackage ../applications/misc/nwg-launchers { };
··· 29655 29656 novnc = callPackage ../applications/networking/novnc { }; 29657 29658 + nwg-bar = callPackage ../applications/misc/nwg-bar { }; 29659 + 29660 nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; 29661 29662 nwg-launchers = callPackage ../applications/misc/nwg-launchers { };