diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-14 19:18:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-14 19:18:26 +0100 |
| commit | 2025bd48442d6f1668bf19c7e434bb3c538974de (patch) | |
| tree | 381f8e08e509787a22c3aa69f5486592643172e4 /pkgs/by-name | |
| parent | 7826c4ffaa4c473bf7f804d312faf27f08c5a409 (diff) | |
| parent | 95f5fbdbfdc3b7853cfbb2cea3649c378e193e68 (diff) | |
| download | nixlib-2025bd48442d6f1668bf19c7e434bb3c538974de.tar nixlib-2025bd48442d6f1668bf19c7e434bb3c538974de.tar.gz nixlib-2025bd48442d6f1668bf19c7e434bb3c538974de.tar.bz2 nixlib-2025bd48442d6f1668bf19c7e434bb3c538974de.tar.lz nixlib-2025bd48442d6f1668bf19c7e434bb3c538974de.tar.xz nixlib-2025bd48442d6f1668bf19c7e434bb3c538974de.tar.zst nixlib-2025bd48442d6f1668bf19c7e434bb3c538974de.zip | |
Merge pull request #295614 from Aleksanaa/fretboard
fretboard: 5.3 -> 5.4
Diffstat (limited to 'pkgs/by-name')
| -rw-r--r-- | pkgs/by-name/fr/fretboard/package.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index 093ad1ac8d67..fa772d61867f 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -1,6 +1,7 @@ { lib , blueprint-compiler , cargo +, darwin , desktop-file-utils , fetchFromGitHub , glib @@ -17,19 +18,19 @@ stdenv.mkDerivation rec { pname = "fretboard"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "bragefuglseth"; - repo = pname; + repo = "fretboard"; rev = "v${version}"; - hash = "sha256-wwq4Xq6IVLF2hICk9HfCpfxpWer8PNWywD8p3wQdp6U="; + hash = "sha256-GqnwAB7hmg2QLwSWqrZtTp6+FybK8/v4GZx/lMi0dGY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-H/dAKaYHxRmldny8EoasrcDROZhLo5UbHPAoMicDehA="; + hash = "sha256-sGvb1+HKIqNSgCV9UzkCrkGrpjA34Pe9eq2/w3K/w/E="; }; nativeBuildInputs = [ @@ -48,8 +49,14 @@ stdenv.mkDerivation rec { glib gtk4 libadwaita + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-function-pointer-types" + ]); + meta = with lib; { description = "Look up guitar chords"; homepage = "https://github.com/bragefuglseth/fretboard"; @@ -57,6 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ michaelgrahamevans ]; mainProgram = "fretboard"; - platforms = platforms.linux; + platforms = platforms.unix; }; } |