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: 8bb98968edf2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11ff53e7cbfb
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 29, 2019

  1. input-fonts: 2017-08-10 → 2019-11-25

    @jtojnar
    jtojnar committed Nov 29, 2019
    Copy the full SHA
    9cbc698 View commit details

  2. zam-plugins: fix build 

    Did not find <GL/gl.h> with libGLU_combined for some reason, libGL works and seems to be sufficient.
    @jtojnar
    jtojnar committed Nov 29, 2019
    Copy the full SHA
    11ff53e View commit details
Showing with 9 additions and 7 deletions.
  1. +6 −4 pkgs/applications/audio/zam-plugins/default.nix
  2. +3 −3 pkgs/data/fonts/input-fonts/default.nix
10 changes: 6 additions & 4 deletions pkgs/applications/audio/zam-plugins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
{ stdenv, fetchgit , boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:

stdenv.mkDerivation {
pname = "zam-plugins";
@@ -12,16 +12,18 @@ stdenv.mkDerivation {
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost libX11 libGLU_combined liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ];
buildInputs = [ boost libX11 libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ];

patchPhase = ''
postPatch = ''
patchShebangs ./dpf/utils/generate-ttl.sh
'';

makeFlags = [
"PREFIX=$(out)"
"PREFIX=${placeholder ''out''}"
];

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = http://www.zamaudio.com/?p=976;
description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio";
6 changes: 3 additions & 3 deletions pkgs/data/fonts/input-fonts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation {
pname = "input-fonts";
version = "2017-08-10"; # date of the download and checksum
version = "2019-11-25"; # date of the download and checksum

src = requireFile {
name = "Input-Font.zip";
url = "https://input.fontbureau.com/download/";
sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq";
sha256 = "10rax2a7vzidcs7kyfg5lv5bwp9i7kvjpdcsd10p0517syijkp3b";
};

nativeBuildInputs = [ unzip ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation {

outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd";
outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv";

meta = with stdenv.lib; {
description = "Fonts for Code, from Font Bureau";