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

Commits on Jul 10, 2017

  1. sway: Add pam, gdk_pixbuf build inputs

    @celldee
    celldee committed Jul 10, 2017
    Copy the full SHA
    82ddeab View commit details

  2. sway: Add cmake version number flag

    @celldee
    celldee committed Jul 10, 2017
    Copy the full SHA
    c27ebd4 View commit details

  3. sway: 0.12.2 -> 0.13.0

    @celldee
    celldee committed Jul 10, 2017
    Copy the full SHA
    cca84bc View commit details

Commits on Jul 12, 2017

  1. Merge pull request #27291 from celldee/sway_0_13_0 

    sway: 0.12.2 -> 0.13.0
    @Mic92
    Mic92 authored Jul 12, 2017
    Copy the full SHA
    9e72b32 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/applications/window-managers/sway/default.nix
9 changes: 5 additions & 4 deletions pkgs/applications/window-managers/sway/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, pango, libinput
, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
, xwayland
, xwayland, pam, gdk_pixbuf
}:

let
version = "0.12.2";
version = "0.13.0";
in
stdenv.mkDerivation rec {
name = "sway-${version}";
@@ -14,18 +14,19 @@ in
owner = "Sircmpwn";
repo = "sway";
rev = "${version}";
sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs";
sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q";
};

nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];

buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ];
buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf ];

patchPhase = ''
sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
'';

makeFlags = "PREFIX=$(out)";
cmakeFlags = "-DVERSION=${version}";
installPhase = "PREFIX=$out make install";

LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];