From d3188e90a09b612aab59187a5a8d15c8bc9887a1 Mon Sep 17 00:00:00 2001 From: Sam Doshi Date: Sat, 31 Aug 2019 14:02:52 +0100 Subject: [PATCH] supercollider: Use qt5's own mkDerivation --- .../interpreters/supercollider/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 2cacb339d757..049dd9192d7e 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, alsaLib +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -7,7 +7,7 @@ let optional = stdenv.lib.optional; in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "supercollider"; version = "3.10.2"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" ]; - cmakeFlags = '' - -DSC_WII=OFF - -DSC_EL=${if useSCEL then "ON" else "OFF"} - ''; + cmakeFlags = [ + "-DSC_WII=OFF" + "-DSC_EL=${if useSCEL then "ON" else "OFF"}" + ]; nativeBuildInputs = [ cmake pkgconfig qttools ];