b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #225642 from wegank/clipboard-jh-darwin

Browse source 
clipboard-jh: 0.3.2 -> 0.6.0
This commit is contained in:
Weijia Wang 2023-04-11 09:37:00 +03:00 committed by GitHub
parent 5922955359 eb374d7bae
commit f45e382317
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/misc/clipboard-jh/default.nix
View file

@ -7,19 +7,24 @@
, wayland-protocols
, wayland
, xorg
, darwin
}:
stdenv.mkDerivation rec {
pname = "clipboard-jh";
version = "0.3.2";
version = "0.6.0";
src = fetchFromGitHub {
owner = "Slackadays";
repo = "clipboard";
rev = version;
sha256 = "sha256-xdogl2WDuQXeLFuBY1u7PSpaoVI9HKScOdxHZ3+whIg=";
hash = "sha256-o3yCWAy7hlFKAFW3tVRG+hL0SRWlNY4hvnhUoDK8GkI=";
};
postPatch = ''
sed -i "/CMAKE_OSX_ARCHITECTURES/d" CMakeLists.txt
'';
nativeBuildInputs = [
cmake
pkg-config
@ -30,6 +35,8 @@ stdenv.mkDerivation rec {
wayland-protocols
wayland
xorg.libX11
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
];
cmakeFlags = [

4
pkgs/top-level/all-packages.nix
View file

@ -13833,7 +13833,9 @@ with pkgs;
clipnotify = callPackage ../tools/misc/clipnotify { };
clipboard-jh = callPackage ../tools/misc/clipboard-jh { };
clipboard-jh = callPackage ../tools/misc/clipboard-jh {
stdenv = if stdenv.isDarwin then llvmPackages_15.stdenv else stdenv;
};
clipbuzz = callPackage ../tools/misc/clipbuzz { };