diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-14 05:37:03 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-14 05:37:03 +0200 |
| commit | 6dfed5d51ab566c30ce2ee610816b65098a43185 (patch) | |
| tree | 2489c986a4fb500d44d392e676025c3368cb7577 | |
| parent | 86872d31b1f8379c4d62aacfa18bd5a9d7530447 (diff) | |
sound-of-sorting: 2017-12-23 -> unstable-2022-10-12
| -rw-r--r-- | pkgs/misc/sound-of-sorting/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 6e838803dea05..4d3aec01439f9 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -1,28 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, wxGTK } : - -stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, wxGTK32, Cocoa }: +stdenv.mkDerivation { pname = "sound-of-sorting"; - version = "2017-12-23"; + version = "unstable-2022-10-12"; src = fetchFromGitHub { owner = "bingmann"; repo = "sound-of-sorting"; - rev = "5884a357af5775fb57d89eb028d4bf150760db75"; - sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8"; + rev = "5cfcaf752593c8cbcf52555dd22745599a7d8b1b"; + sha256 = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8="; }; - buildInputs = - [ wxGTK SDL2 ]; + nativeBuildInputs = [ pkg-config ]; - preConfigure = '' - export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config - ''; + buildInputs = [ wxGTK32 SDL2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; meta = with lib; { description = "Audibilization and Visualization of Sorting Algorithms"; homepage = "https://panthema.net/2013/sound-of-sorting/"; - license = with licenses; gpl3; + license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2feb82460f3d3..ee324d912deb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36818,7 +36818,9 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem {}; - soundOfSorting = callPackage ../misc/sound-of-sorting { }; + soundOfSorting = callPackage ../misc/sound-of-sorting { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags; |