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: 16e8c0aed8fa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a8c1b24bc6d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Jan 1, 2018

  1. dirt: 2015-04-28 -> 2018-01-01

    @puffnfresh
    puffnfresh committed Jan 1, 2018

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    638c017 View commit details

  2. dirt: export PREFIX as makeFlags instead

    @Mic92
    Mic92 committed Jan 1, 2018
    Copy the full SHA
    eebcc66 View commit details

  3. Merge pull request #33265 from puffnfresh/package/dirt 

    dirt: 2015-04-28 -> 2018-01-01
    @Mic92
    Mic92 authored Jan 1, 2018
    Copy the full SHA
    9a8c1b2 View commit details
Showing with 6 additions and 7 deletions.
  1. +6 −7 pkgs/applications/audio/dirt/default.nix
13 changes: 6 additions & 7 deletions pkgs/applications/audio/dirt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:

stdenv.mkDerivation rec {
name = "dirt-2015-04-28";
name = "dirt-2018-01-01";
src = fetchFromGitHub {
repo = "Dirt";
owner = "tidalcycles";
rev = "cfc5e85318defda7462192b5159103c823ce61f7";
sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
rev = "b09604c7d8e581bc7799d7e2ad293e7cdd254bda";
sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n";
fetchSubmodules = true;
};
buildInputs = [ libsndfile libsamplerate liblo libjack2 ];
postPatch = ''
sed -i "s|./samples|$out/share/dirt/samples|" file.h
'';
configurePhase = ''
export DESTDIR=$out
sed -i "s|./samples|$out/share/dirt/samples|" dirt.c
'';
makeFlags = ["PREFIX=$(out)"];
postInstall = ''
mkdir -p $out/share/dirt/
cp -r samples $out/share/dirt/