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

Commits on Mar 25, 2018

  1. helmholtz: fix failing build

    @magnetophon
    magnetophon committed Mar 25, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5bb96e7 View commit details

Commits on Mar 28, 2018

  1. Merge pull request #37781 from magnetophon/helmholtz 

    helmholtz: fix failing build
    @fpletz
    fpletz authored Mar 28, 2018

    Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    globin’s contribution has been verified via GPG key.
    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
    f4e32ec View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/applications/audio/pd-plugins/helmholtz/default.nix
3 changes: 3 additions & 0 deletions pkgs/applications/audio/pd-plugins/helmholtz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,13 +20,16 @@ stdenv.mkDerivation rec {
mv helmholtz~/src/Makefile .
rm -rf helmholtz~/src/
rm helmholtz~/helmholtz~.pd_darwin
rm helmholtz~/helmholtz~.pd_linux
rm helmholtz~/helmholtz~.dll
rm -rf __MACOSX
'';

patchPhase = ''
mkdir -p $out/helmholtz~
sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile
sed -i "s@-Wl@@g" Makefile
sed -i "s@\$(NAME).pd_linux \.\./\$(NAME).pd_linux@helmholtz~.pd_linux $out/helmholtz~/@g" Makefile
'';

installPhase = ''