diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
| commit | 50053cda79099c9a0b2a7803aef61f730a54848f (patch) | |
| tree | 6413bbed5cbdd3f58d26d54cbf1b37d54a8c3a22 /nixpkgs/pkgs/applications/window-managers/sway | |
| parent | 7fbd32a525182f2089e1098723219a1a4ef264bb (diff) | |
| parent | 36f316007494c388df1fec434c1e658542e3c3cc (diff) | |
| download | nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.gz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.bz2 nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.lz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.xz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.zst nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.zip | |
Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'
Diffstat (limited to 'nixpkgs/pkgs/applications/window-managers/sway')
| -rw-r--r-- | nixpkgs/pkgs/applications/window-managers/sway/beta.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/sway/beta.nix b/nixpkgs/pkgs/applications/window-managers/sway/beta.nix index 8b2acc94ea08..96e919df5a69 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/beta.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/beta.nix @@ -10,15 +10,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "sway"; - version = "1.0-rc1"; + version = "1.0-rc2"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "1zigx2yz0i91iz2r2l6csq33hscaybmaq1p19jgxrazms7z213mz"; + sha256 = "052if3nagmwg5zh79nhrq75fbc9v2x950lcs1mal52p801qiv8f1"; }; + postPatch = '' + sed -iE "s/version: '1.0',/version: '${version}',/" meson.build + ''; + nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs scdoc; @@ -32,8 +36,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; mesonFlags = [ - "-Dsway-version=${version}" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" - "-Dman-pages=enabled" "-Dtray=enabled" + "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + "-Dtray=enabled" ]; meta = with stdenv.lib; { |