Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a614f9f4c1ba
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 361bd591ea4a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 22, 2018

  1. streamripper: Don't use included libmad

    streamripper ships its own version of libmad, which does not compile on
    clang, due to the usage of incompatible compiler flags. We can get the
    build working by using the already packaged libmad, which includes
    patches for clang.
    
    (cherry picked from commit e770712)
    knedlsepp authored and LnL7 committed Mar 22, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    361bd59 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/applications/audio/streamripper/default.nix
5 changes: 2 additions & 3 deletions pkgs/applications/audio/streamripper/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }:
{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }:

stdenv.mkDerivation rec {
name = "streamripper-${version}";
@@ -10,13 +10,12 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libogg libvorbis ];
buildInputs = [ glib libogg libvorbis libmad ];

meta = with stdenv.lib; {
homepage = http://streamripper.sourceforge.net/;
description = "Application that lets you record streaming mp3 to your hard drive";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ the-kenny ];
};
}