diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/screensavers/electricsheep/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/sound-of-sorting/default.nix | 20 |
2 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 4b79758ef892a..0ab0f6bee31e2 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://electricsheep.org/"; maintainers = with maintainers; [ ]; platforms = platforms.linux; - license = licenses.gpl1; + license = licenses.gpl2Only; }; } 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 ]; }; } |