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: 3a173c1d7530
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7e62388ed70c
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 24, 2020

  1. wofi: 1.1 -> 1.1.2

    Elyhaka authored and Elyhaka committed Mar 24, 2020
    Copy the full SHA
    2c96f59 View commit details

  2. wofi: fixes allow_images=true crash

    Elyhaka authored and Elyhaka committed Mar 24, 2020
    Copy the full SHA
    968b6ad View commit details

  3. Merge pull request #83283 from Elyhaka/wofi-fix 

    wofi: 1.1 -> 1.1.2 + fix
    @dywedir
    dywedir authored Mar 24, 2020
    Copy the full SHA
    7e62388 View commit details
Showing with 14 additions and 4 deletions.
  1. +14 −4 pkgs/applications/misc/wofi/default.nix
18 changes: 14 additions & 4 deletions pkgs/applications/misc/wofi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3 }:
{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook }:

stdenv.mkDerivation rec {
pname = "wofi";
version = "1.1";
version = "1.1.2";

src = fetchhg {
url = "https://hg.sr.ht/~scoopta/wofi";
rev = "v${version}";
sha256 = "0rq6c8fv0h7xj3jw1i01r39dz0f31k7jgf7hpgl6mlsyn0ddc80z";
sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn";
};

nativeBuildInputs = [ pkg-config meson ninja ];
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ];
buildInputs = [ wayland gtk3 ];

# Fixes icon bug on NixOS.
# Will need to be removed on next release
# see https://todo.sr.ht/~scoopta/wofi/54
patches = [
(fetchpatch {
url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49";
sha256 = "18960y9ajilrwwl6mjnrh6wj0sm4ivczmacck36p2dj9xd0n8vkh";
})
];

meta = with lib; {
description = "A launcher/menu program for wlroots based wayland compositors such as sway";
homepage = "https://hg.sr.ht/~scoopta/wofi";