Unverified Commit 4cd52bdf authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #273609 from wegank/fluxus-unbreak-2 

fluxus: cleanup, unbreak
parents 029b2377 6666381e

pkgs/applications/graphics/fluxus/default.nix

+8 −8
Original line number Diff line number Diff line 
{ lib, stdenv

{ lib

, stdenv

, fetchFromGitLab

, alsa-lib

, bzip2

, fftw

, freeglut

, freetype

, glew

, libjack2

, libGL

, libGLU

, libjpeg

, liblo

, libpng

, libsndfile

, libtiff

, ode
@@ -19,12 +16,11 @@ 
, openssl

, racket_7_9

, scons

, zlib

}:

let

  racket = racket_7_9;

in

stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "fluxus";

  version = "0.19";

  src = fetchFromGitLab {
@@ -53,6 +49,10 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [ scons ];



  patches = [ ./fix-build.patch ];

  postPatch = ''

    substituteInPlace src/Unicode.cpp \

      --replace "(byte)" "(unsigned char)"

  '';

  sconsFlags = [

    "RacketPrefix=${racket}"

    "RacketInclude=${racket}/include/racket"
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl2;

    homepage = "http://www.pawfal.org/fluxus/";

    maintainers = [ maintainers.brainrape ];

    broken = true;

    platforms = platforms.linux;

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -31589,7 +31589,7 @@ with pkgs; 














  flrig = callPackage ../applications/radio/flrig { };



























  fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; };













  fluxus = callPackage ../applications/graphics/fluxus { };





























  flwrap = callPackage ../applications/radio/flwrap { };