Skip to content

Commit

Permalink
Revert "alsa-firmware: 1.2.1 -> 1.2.4"
Browse files Browse the repository at this point in the history
This was pushed to master without a PR and broke cross compilation of a
small cross-NixOS:

```
configure: error: in `/build/alsa-firmware-1.2.4':
configure: error: C compiler cannot create executables
See `config.log' for more details
```

Let's re-roll this in a PR.

This reverts commit 72f71e9.
  • Loading branch information
flokli committed Dec 24, 2020
1 parent c505e57 commit a285c3e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions pkgs/os-specific/linux/alsa-firmware/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:

stdenv.mkDerivation rec {
name = "alsa-firmware-1.2.4";
name = "alsa-firmware-1.2.1";

src = fetchurl {
url = "mirror://alsa/firmware/${name}.tar.bz2";
sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs=";
sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf";
};

patches = [ (fetchpatch {
url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch";
sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78";
}) ];

nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ];

configureFlags = [
Expand Down

2 comments on commit a285c3e

@flokli
Copy link
Contributor Author

@flokli flokli commented on a285c3e Dec 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reported this upstream in alsa-project/alsa-firmware#3.

@flokli
Copy link
Contributor Author

@flokli flokli commented on a285c3e Dec 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also cc @matthewbauer probably ;-)

Please sign in to comment.