Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 830599debeca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c2c27c94cb5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 27, 2018

  1. dwm-status: 1.5.0 -> 1.6.0 (#52982)

    @Gerschtli @timokau
    Gerschtli authored and timokau committed Dec 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    samueljsb Samuel Searles-Bryant
    SSH Key Fingerprint: UG1vbpwfv/yF8hRSqV7FLQGL2iSyjGsdQ/WDrm5be+I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c2c27c View commit details
Showing with 9 additions and 9 deletions.
  1. +9 −9 pkgs/applications/window-managers/dwm/dwm-status.nix
18 changes: 9 additions & 9 deletions pkgs/applications/window-managers/dwm/dwm-status.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg
, enableAlsaUtils ? true, alsaUtils, bash, coreutils }:
, enableAlsaUtils ? true, alsaUtils, coreutils
, enableNetwork ? true, dnsutils, iproute, wirelesstools }:

let
binPath = stdenv.lib.makeBinPath [
alsaUtils bash coreutils
];
bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ]
++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ];
in

rustPlatform.buildRustPackage rec {
name = "dwm-status-${version}";
version = "1.5.0";
version = "1.6.0";

src = fetchFromGitHub {
owner = "Gerschtli";
repo = "dwm-status";
rev = version;
sha256 = "0mfzpyacd7i6ipbjwyl1zc0x3lnz0f4qqzsmsb07p047z95mw4v6";
sha256 = "02gvlxv6ylx4mdkf59crm2zyahiz1zd4cr5zz29dnhx7r7738i9a";
};

nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];

cargoSha256 = "1cngcacsbzijs55k4kz8fidki3p8jblk3v5s21hjsn4glzjdbkmm";
cargoSha256 = "1khknf1bjs80cc2n4jnpilf8cc15crykhhyvvff6q4ay40353gr6";

postInstall = lib.optionalString enableAlsaUtils ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${binPath}"
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"
'';

meta = with stdenv.lib; {