Merge pull request #34549 from gnidorah/way-cooler

way-cooler: 0.6.2 -> 0.8.0

pkgs/applications/window-managers/way-cooler/default.nix

@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
+{ stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
-, wayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon, pam, python3Packages, lemonbar
+, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf
 }:
 
 let
@@ -9,13 +9,10 @@ let
   fakegit = writeShellScriptBin "git" ''
     echo ""
   '';
-  way-cooler = ((callPackage ./way-cooler.nix {}).way_cooler_0_6_2.override {
+  way-cooler = (((callPackage ./way-cooler.nix {}).way_cooler { builtin-lua = true; }).override {
     crateOverrides = defaultCrateOverrides // {
 
-    way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit ]; };
+    way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; };
-    dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
-    gobject-sys = attrs: { buildInputs = [ dbus_glib ]; };
-    cairo-rs = attrs: { buildInputs = [ cairo ]; };
   };}).overrideAttrs (oldAttrs: rec {
     nativeBuildInputs = [ makeWrapper ];
 
@@ -23,51 +20,35 @@ let
       mkdir -p $out/etc
       cp -r config $out/etc/way-cooler
     '';
-    # prior v0.7 https://github.com/way-cooler/way-cooler/issues/395
     postFixup = ''
-      makeWrapper $out/bin/way_cooler $out/bin/way-cooler \
+      cd $out/bin
+      mv way_cooler way-cooler
+    '';
+  });
+  wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
+    nativeBuildInputs = [ makeWrapper ];
+
+    postFixup = ''
+      makeWrapper $out/bin/wc_bg $out/bin/wc-bg \
         --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
     '';
   });
-  wc-bg = ((callPackage ./wc-bg.nix {}).way_cooler_bg_0_2_1.override {
+  wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec {
-    crateOverrides = defaultCrateOverrides // {
-
-    dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
-  };}).overrideAttrs (oldAttrs: rec {
-    postFixup = ''
-      cd $out/bin
-      mv way_cooler_bg way-cooler-bg
-    '';
-  });
-  wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab_0_2_0.override {
-    crateOverrides = defaultCrateOverrides // {
-
-    wc-grab = attrs: {
-      src = fetchFromGitHub {
-        owner = "way-cooler";
-        repo = "way-cooler-grab";
-        rev = "v0.2.0";
-        sha256 = "1pc8rhvzdi6bi8g5w03i0ygbcpks9051c3d3yc290rgmmmmkmnwq";
-      };
-    };
-
-    dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
-  };}).overrideAttrs (oldAttrs: rec {
     postFixup = ''
       cd $out/bin
       mv wc_grab wc-grab
     '';
   });
-  wc-lock = ((callPackage ./wc-lock.nix {}).wc_lock_0_1_0.override {
+  wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override {
-    crateOverrides = defaultCrateOverrides // { wc-lock = attrs: {
+    crateOverrides = defaultCrateOverrides // {
 
-    buildInputs = [ pam ];
+    wc-lock = attrs: { buildInputs = [ pam ]; };
-  };};}).overrideAttrs (oldAttrs: rec {
+  };}).overrideAttrs (oldAttrs: rec {
     nativeBuildInputs = [ makeWrapper ];
 
     postFixup = ''
       makeWrapper $out/bin/wc_lock $out/bin/wc-lock \
-        --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon ]}"
+        --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}"
     '';
   });
   # https://github.com/way-cooler/way-cooler/issues/446
@@ -102,7 +83,7 @@ let
     ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d
   '';
 in symlinkJoin rec {
-  version = "0.6.2";
+  version = "0.8.0";
   name = "way-cooler-with-extensions-${version}";
   paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ];
 

pkgs/build-support/rust/default-crate-overrides.nix

@@ -1,5 +1,5 @@
 { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
-  openssl, sqlite, zlib, ... }:
+  openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, ... }:
 
 let
   inherit (darwin.apple_sdk.frameworks) CoreFoundation;
@@ -36,4 +36,28 @@ in
   openssl-sys = attrs: {
     buildInputs = [ pkgconfig openssl ];
   };
+  dbus = attrs: {
+    buildInputs = [ pkgconfig dbus_libs ];
+  };
+  libdbus-sys = attrs: {
+    buildInputs = [ pkgconfig dbus_libs ];
+  };
+  gobject-sys = attrs: {
+    buildInputs = [ dbus_glib ];
+  };
+  gio-sys = attrs: {
+    buildInputs = [ dbus_glib ];
+  };
+  gdk-pixbuf-sys = attrs: {
+    buildInputs = [ dbus_glib ];
+  };
+  gdk-pixbuf = attrs: {
+    buildInputs = [ gdk_pixbuf ];
+  };
+  cairo-rs = attrs: {
+    buildInputs = [ cairo ];
+  };
+  xcb = attrs: {
+    buildInputs = [ python3 ];
+  };
 }