diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-04-10 20:43:08 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-04-10 20:43:08 +0200 |
commit | 69bfdf2484041b9d242840c4e5017b4703383bb0 (patch) | |
tree | d8bdaa69e7990d7d6f09b594b3c425f742acd2d0 /nixpkgs/pkgs/by-name/xw/xwayland-run/package.nix | |
parent | c8aee4b4363b6bf905a521b05b7476960e8286c8 (diff) | |
parent | d8fe5e6c92d0d190646fb9f1056741a229980089 (diff) | |
download | nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.gz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.bz2 nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.lz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.xz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.zst nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.zip |
Merge commit 'd8fe5e6c'
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/by-name/xw/xwayland-run/package.nix')
-rw-r--r-- | nixpkgs/pkgs/by-name/xw/xwayland-run/package.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/by-name/xw/xwayland-run/package.nix b/nixpkgs/pkgs/by-name/xw/xwayland-run/package.nix index 580af8afa8d0..9d4e55872344 100644 --- a/nixpkgs/pkgs/by-name/xw/xwayland-run/package.nix +++ b/nixpkgs/pkgs/by-name/xw/xwayland-run/package.nix @@ -1,6 +1,4 @@ -{ cage -, fetchFromGitLab -, gnome +{ fetchFromGitLab , lib , meson , ninja @@ -8,25 +6,28 @@ , weston , xorg , xwayland -, withMutter ? false -, withCage ? false +, withCage ? false , cage +, withKwin ? false , kdePackages +, withMutter ? false, gnome +, withDbus ? withMutter , dbus # Since 0.0.3, mutter compositors run with their own DBUS sessions }: let compositors = [ weston ] - ++ lib.optional withMutter gnome.mutter ++ lib.optional withCage cage + ++ lib.optional withKwin kdePackages.kwin + ++ lib.optional withMutter gnome.mutter ++ lib.optional withDbus dbus ; in python3.pkgs.buildPythonApplication rec { pname = "xwayland-run"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ofourdan"; repo = "xwayland-run"; rev = version; - hash = "sha256-+HdRLIizEdtKWD8HadQQf750e2t1AWa14U/Xwu3xPK4="; + hash = "sha256-yYULbbcFDT1zRFn1UWS0dyuchGYnOZypDmxqc14RYF4="; }; pyproject = false; @@ -38,7 +39,6 @@ python3.pkgs.buildPythonApplication rec { ninja ]; - postInstall = '' wrapProgram $out/bin/wlheadless-run \ --prefix PATH : ${lib.makeBinPath compositors} |