diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-20 00:05:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-20 00:05:13 +0000 |
| commit | aac580f88f705cd65d47672a8bc1fac3482f9837 (patch) | |
| tree | 78eca36e986e366284af6152ab80bd307806c9d4 /pkgs/applications/graphics | |
| parent | da85286b28f0be9029a514fcba29ee13d9762317 (diff) | |
| parent | ba90bab628277d977d3a381e91d4ce0af4ea4f91 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/epick/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index c82f4f4d5f80f..fd767e356f12c 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -2,44 +2,47 @@ , rustPlatform , fetchFromGitHub , stdenv -, python3 +, pkg-config +, expat +, fontconfig +, freetype , libGL , xorg -, libxkbcommon +, darwin , AppKit -, IOKit }: rustPlatform.buildRustPackage rec { pname = "epick"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "vv9k"; repo = pname; rev = version; - sha256 = "sha256-b4if2ggJY+8CsCX8jbnnWXy16k7sfB88CLlYYCrtltk="; + sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU="; }; - cargoSha256 = "sha256-HyGSmeLJ+2Twkg94p1QqXZDix0mU2jGFfEot6hgUg34="; + cargoSha256 = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; - nativeBuildInputs = lib.optional stdenv.isLinux python3; + nativeBuildInputs = lib.optionals stdenv.isLinux [ + pkg-config + ]; buildInputs = lib.optionals stdenv.isLinux [ - libGL + expat + fontconfig + freetype xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr - xorg.libxcb - libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit - IOKit ]; postFixup = lib.optionalString stdenv.isLinux '' - patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $out/bin/epick + patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} ''; meta = with lib; { |