diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/swaybg/metadata.nix | 6 | ||||
-rw-r--r-- | pkgs/waybar/metadata.nix | 6 | ||||
-rw-r--r-- | pkgs/wlroots/default.nix | 15 | ||||
-rw-r--r-- | pkgs/wlroots/metadata.nix | 6 | ||||
-rw-r--r-- | pkgs/wltrunk/metadata.nix | 4 |
5 files changed, 13 insertions, 24 deletions
diff --git a/pkgs/swaybg/metadata.nix b/pkgs/swaybg/metadata.nix index 877a1e9..6de153f 100644 --- a/pkgs/swaybg/metadata.nix +++ b/pkgs/swaybg/metadata.nix @@ -1,5 +1,5 @@ { - rev = "25c6eaf15e64655385f01cbb98bffe28a862fe13"; - sha256 = "1j39al8dnjkbsm68h7c9nf7gm79gf798qqfaks7fq0cphal1gnr0"; - revdate = "2019-05-04T12:08:26Z"; + rev = "a8f109af90353369e7e2e689efe8ce06eb9c60ac"; + sha256 = "0w0vyckh01mzr479jjqdc6dyj84gcc2k8q7x8v4b0d445za4hrar"; + revdate = "2019-08-08T23:03:44Z"; } diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix index f506fdf..e4959ba 100644 --- a/pkgs/waybar/metadata.nix +++ b/pkgs/waybar/metadata.nix @@ -1,5 +1,5 @@ { - rev = "43beefb00d41d72f2d8ab549343e0415c08ac8b5"; - sha256 = "13cqdcgvk6baz58gn4x3rlvyk3smf9gmmh7s3jghxqkfj9icgcfl"; - revdate = "2019-07-31T10:13:45Z"; + rev = "e9b6380c1893d686992e0789d1dedc97f30ef779"; + sha256 = "15biyr422s5f2csw395fz9cikir9wffdwqq8y0i6ayzpymzsqbzs"; + revdate = "2019-08-08T10:25:31Z"; } diff --git a/pkgs/wlroots/default.nix b/pkgs/wlroots/default.nix index fc01cdc..a5b72dd 100644 --- a/pkgs/wlroots/default.nix +++ b/pkgs/wlroots/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { # $out for the library, $bin for rootston, and $examples for the example # programs (in examples) AND rootston - outputs = [ "out" "bin" "examples" ]; + outputs = [ "out" "examples" ]; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -39,22 +39,11 @@ in stdenv.mkDerivation rec { ]; postInstall = '' - # Install rootston (the reference compositor) to $bin and $examples - for output in "$bin" "$examples"; do - mkdir -p $output/bin - cp rootston/rootston $output/bin/ - mkdir $output/lib - cp libwlroots* $output/lib/ - patchelf \ - --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ - $output/bin/rootston - mkdir $output/etc - cp ../rootston/rootston.ini.example $output/etc/rootston.ini - done # Install ALL example programs to $examples: # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle # screenshot output-layout multi-pointer rotation tablet touch pointer # simple + mkdir -p $examples/bin cd ./examples for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do patchelf \ diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix index abee671..411cf53 100644 --- a/pkgs/wlroots/metadata.nix +++ b/pkgs/wlroots/metadata.nix @@ -1,5 +1,5 @@ { - rev = "01f903874b7e27539488fad7f31476d5bcbc6ac9"; - sha256 = "1igrs4lk74ps4jzi76r1xpj91ms9izx3n5kgrv5kihjyzrlbz2a5"; - revdate = "2019-08-07T07:22:11Z"; + rev = "58b2584863201f32d1a4770a1d5cde5e57b300c6"; + sha256 = "1i2jy7mygaqq7dh394v9acgb54nkm9lhq8ka7bd4yyqq5851b9sd"; + revdate = "2019-08-08T23:34:59Z"; } diff --git a/pkgs/wltrunk/metadata.nix b/pkgs/wltrunk/metadata.nix index de5981d..86c7efe 100644 --- a/pkgs/wltrunk/metadata.nix +++ b/pkgs/wltrunk/metadata.nix @@ -1,4 +1,4 @@ { - rev = "0d6af745fb8604382498e50b73f4456fdd1f6ec3"; - sha256 = "0cnpcq55lrhpjvi04a5j1dhchpqbw5kyiwqrywxa2icyii63nf8y"; + rev = "a9a5feeba25f201c1912d2fe3c8031af440366a4"; + sha256 = "0b48yrwml966z8xypi5m7kvxnxq3gg2zmp9gi5aid5p5nizba6sw"; } |