diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/libraries/gsm | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/libraries/gsm')
| -rw-r--r-- | pkgs/development/libraries/gsm/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 30cffa89938..f70a748a20e 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl -, staticSupport ? false # Compile statically (support for packages that look for the static object) +{ lib, stdenv, fetchurl +, # Compile statically (support for packages that look for the static object) + staticSupport ? stdenv.hostPlatform.isStatic }: let inherit (stdenv) isDarwin; - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { @@ -17,6 +18,8 @@ stdenv.mkDerivation rec { }; patchPhase = '' + substituteInPlace Makefile \ + --replace "= gcc " "?= gcc " # Fix include directory sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile '' + optionalString (!staticSupport) ( @@ -43,7 +46,7 @@ stdenv.mkDerivation rec { parallelBuild = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Lossy speech compression codec"; homepage = "http://www.quut.com/gsm/"; license = licenses.bsd2; |