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

Commits on Nov 27, 2018

  1. renoise: needs only mpg123 library 

    Moved in postFixup because fixup phase shrinks RPATH
    @c0bw3b
    c0bw3b authored Nov 27, 2018
    Copy the full SHA
    af31c4e View commit details
Showing with 9 additions and 6 deletions.
  1. +9 −6 pkgs/applications/audio/renoise/default.nix
15 changes: 9 additions & 6 deletions pkgs/applications/audio/renoise/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib,
mpg123, makeWrapper, releasePath ? null }:
{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib
, mpg123, releasePath ? null }:

with stdenv.lib;

@@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
releasePath
else throw "Platform is not supported by Renoise";

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ];

installPhase = ''
cp -r Resources $out
@@ -56,9 +55,13 @@ stdenv.mkDerivation rec {
mkdir $out/bin
ln -s $out/renoise $out/bin/renoise
'';

patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise
wrapProgram "$out/renoise" --prefix LD_LIBRARY_PATH : "${mpg123}/lib"
postFixup = ''
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath ${mpg123}/lib:$out/lib \
$out/renoise
'';

meta = {