Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 732c0a0d533e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3188e90a09b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 1, 2019

  1. supercollider: Use qt5's own mkDerivation

    @samdoshi @worldofpeace
    samdoshi authored and worldofpeace committed Sep 1, 2019
    Copy the full SHA
    d3188e9 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/development/interpreters/supercollider/default.nix
12 changes: 6 additions & 6 deletions pkgs/development/interpreters/supercollider/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];