From 06353a235faa6a7565b45e7cbcfdbafb384be482 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 23 Mar 2021 12:35:42 +0100 Subject: [PATCH] supercollider: fix Qt wrapping --- .../interpreters/supercollider/default.nix | 13 +++++-------- 1 file 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" ]; }; }