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

Commits on Apr 19, 2020

  1. Revert "[WIP] {help wanted} twolame: 2017-09-27 -> 0.4.0"

    @worldofpeace
    worldofpeace authored Apr 19, 2020
    Copy the full SHA
    0bab525 View commit details

  2. Merge pull request #85527 from NixOS/revert-84363-update-twolame 

    Revert "[WIP] {help wanted} twolame: 2017-09-27 -> 0.4.0"
    @worldofpeace
    worldofpeace authored Apr 19, 2020
    Copy the full SHA
    b8a2ebd View commit details
Showing with 8 additions and 10 deletions.
  1. +8 −10 pkgs/development/libraries/twolame/default.nix
18 changes: 8 additions & 10 deletions pkgs/development/libraries/twolame/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
{ stdenv, fetchFromGitHub
, autoreconfHook
, pkgconfig
, libsndfile, xmlto, asciidoc }:
, autoreconfHook, pkgconfig
, libsndfile }:

with stdenv.lib;
stdenv.mkDerivation rec {
stdenv.mkDerivation {

pname = "twolame";
version = "0.4.0";
version = "2017-09-27";

src = fetchFromGitHub {
owner = "njh";
repo = "twolame";
rev = version;
sha256 = "0ckwdx5kmgmh1jq2wl6c9d57pf6z6p2wjdy6fw01a8f3clg21a8g";
rev = "977c8ac55d8ca6d5f35d1d413a119dac2b3b0333";
sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x";
};

nativeBuildInputs = [ autoreconfHook pkgconfig xmlto asciidoc ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libsndfile ];

doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found"

meta = {
meta = with stdenv.lib;{
description = "A MP2 encoder";
longDescription = ''
TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on