diff options
| author | Elis Hirwing <elis@hirwing.se> | 2022-05-20 10:17:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 10:17:28 +0200 |
| commit | c4af64cb82730fc94833d18bde4719d6cb77f830 (patch) | |
| tree | 7e0cce8117071238da13b43268b8b2ea1a64b98a | |
| parent | ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8 (diff) | |
| parent | 84467ab40fda190c18703bdaf2f32994a1da7f5e (diff) | |
| download | nixpkgs-c4af64cb82730fc94833d18bde4719d6cb77f830.tar nixpkgs-c4af64cb82730fc94833d18bde4719d6cb77f830.tar.gz nixpkgs-c4af64cb82730fc94833d18bde4719d6cb77f830.tar.bz2 nixpkgs-c4af64cb82730fc94833d18bde4719d6cb77f830.tar.lz nixpkgs-c4af64cb82730fc94833d18bde4719d6cb77f830.tar.xz nixpkgs-c4af64cb82730fc94833d18bde4719d6cb77f830.tar.zst nixpkgs-c4af64cb82730fc94833d18bde4719d6cb77f830.zip | |
Merge pull request #173723 from trofi/fix-fno-common-for-dmrconfig
dmrconfig: pull upstram fix for -fno-common toolchains
| -rw-r--r-- | pkgs/applications/radio/dmrconfig/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index 4bf523a8b8b..b91e9bc63a5 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , libusb1, systemd }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains. + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/OpenRTX/dmrconfig/commit/1a6901488db26262a6b69f80b0e795864e9e8d0a.patch"; + sha256 = "03px1y95a8aspd251i1jj8ggqfjvkqby4lhn5pb7l5c1lzh6h762"; + }) + ]; + buildInputs = [ libusb1 systemd ]; |