diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-03 22:40:32 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-03 22:40:32 +0200 |
| commit | 1e107443ad0867ca0c923556e13a2c9a92e9e98a (patch) | |
| tree | 4320b541e23ffcf683556ef49cdf10e9dd1eed05 /pkgs/os-specific | |
| parent | a5913ce2722b067fdc346a3c06e51ff5aaa1aef9 (diff) | |
| parent | 618ac29687a650d854c8bea7efd4490387589ce2 (diff) | |
| download | nixlib-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar nixlib-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.gz nixlib-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.bz2 nixlib-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.lz nixlib-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.xz nixlib-1e107443ad0867ca0c923556e13a2c9a92e9e98a.tar.zst nixlib-1e107443ad0867ca0c923556e13a2c9a92e9e98a.zip | |
Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/khd/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/kwm/default.nix | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index 8a2f4f46e03f..fb7bb12a493f 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub, Carbon, Cocoa }: +{ stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }: stdenv.mkDerivation rec { name = "khd-${version}"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = "khd"; rev = "v${version}"; - sha256 = "1ijfrlnwdf8hk259j3jfxj6zizvqzj57458rflza626z5dnhmbpr"; + sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4"; }; + patches = [ + # Fixes build issues, remove with >3.0.0 + (fetchpatch { + url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch; + sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np"; + }) + ]; + buildInputs = [ Carbon Cocoa ]; buildPhase = '' diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index ac231f2dfe3d..3076392ecb26 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "kwm-${version}"; - version = "4.0.4"; + version = "4.0.5"; src = fetchzip { stripRoot = false; url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip"; - sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc"; + sha256 = "1ld1vblg3hmc6lpb8p2ljvisbkijjkijf4y87z5y1ia4k8pk7mxb"; }; # TODO: Build this properly once we have swiftc. |