diff options
author | Artturi <Artturin@artturin.com> | 2022-10-15 04:27:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-15 04:27:23 +0300 |
commit | 56cbdc3b83e1948527705982748a16ee28a1829c (patch) | |
tree | 971355406c295c830c0c9c44c34f656bccd73004 /pkgs/applications/graphics | |
parent | 065ae03aa7f6f6cb8ffb75526d091a9a6c25e3a8 (diff) | |
parent | 61c3058bcb4877cecd4fd2e15ac64b5052b6aab2 (diff) |
Merge pull request #195874 from Artturin/removeinheritxorg
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/epick/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/graphics/menyoki/default.nix | 5 |
2 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index fda56c0d8cb7a..c82f4f4d5f80f 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -4,11 +4,7 @@ , stdenv , python3 , libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libxcb +, xorg , libxkbcommon , AppKit , IOKit @@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ libGL - libX11 - libXcursor - libXi - libXrandr - libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 5615044b90e7b..1f25332e85269 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -6,8 +6,7 @@ , stdenv , withSixel ? false , libsixel -, libX11 -, libXrandr +, xorg , AppKit , withSki ? true }: @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optional withSixel libsixel - ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ] + ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ]) ++ lib.optional stdenv.isDarwin AppKit; buildNoDefaultFeatures = !withSki; |