diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-07 12:06:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-07 12:06:23 +0000 |
commit | 1d48804dab8a67e1891d7cb1f0517f52e62d270b (patch) | |
tree | 96fcd4bc79fd0ffa521d13eecf9c45eabedcd3c8 /pkgs/development/interpreters | |
parent | 714ef27ffef04d18f07310a752f178ffddec395f (diff) | |
parent | de679c57ca579974f35fab5444c7892ceb16230a (diff) | |
download | nixpkgs-1d48804dab8a67e1891d7cb1f0517f52e62d270b.tar nixpkgs-1d48804dab8a67e1891d7cb1f0517f52e62d270b.tar.gz nixpkgs-1d48804dab8a67e1891d7cb1f0517f52e62d270b.tar.bz2 nixpkgs-1d48804dab8a67e1891d7cb1f0517f52e62d270b.tar.lz nixpkgs-1d48804dab8a67e1891d7cb1f0517f52e62d270b.tar.xz nixpkgs-1d48804dab8a67e1891d7cb1f0517f52e62d270b.tar.zst nixpkgs-1d48804dab8a67e1891d7cb1f0517f52e62d270b.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index a1612680b25..b7efc37ae04 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, alsaLib +{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs }: -let optional = lib.optional; +let + inherit (lib) optional; in - -stdenv.mkDerivation rec { +mkDerivation rec { pname = "supercollider"; version = "3.11.2"; - src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; sha256 = "wiwyxrxIJnHU+49RZy33Etl6amJ3I1xNojEpEDA6BQY="; @@ -31,13 +30,11 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) alsaLib ++ optional useSCEL emacs; - dontWrapQtApps = true; - meta = with lib; { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; maintainers = with maintainers; [ mrmebelman ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = [ "x686-linux" "x86_64-linux" ]; }; } |