diff options
author | figsoda <figsoda@pm.me> | 2022-10-18 16:05:28 -0400 |
---|---|---|
committer | figsoda <figsoda@pm.me> | 2022-10-18 16:52:30 -0400 |
commit | 24e81b7bf307c329ed594554c3d4c3eae5a5ebb4 (patch) | |
tree | 8dacd7d4020385747ccd1281e81a6ff08640900e /pkgs | |
parent | 76db7d42f5d07b8a29f53cf84f9f1d8d257d73d1 (diff) |
epick: 0.8.2 -> 0.9.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/epick/default.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 16 insertions, 13 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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5590178de1322..b1643e828bd74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27869,7 +27869,7 @@ with pkgs; epic5 = callPackage ../applications/networking/irc/epic5 { }; epick = callPackage ../applications/graphics/epick { - inherit (darwin.apple_sdk.frameworks) AppKit IOKit; + inherit (darwin.apple_sdk.frameworks) AppKit; }; epr = callPackage ../applications/misc/epr { }; |