diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-09-29 07:58:42 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-09-29 07:59:00 +0100 |
| commit | 7f30088485a24e369798336110ab11f22cbe37a3 (patch) | |
| tree | 7f35d37fe8a914db2152e0807b9dd1fc667c2040 | |
| parent | d5a24b5b9a9b96544c61662866e2ada7108ddf94 (diff) | |
| download | nixpkgs-7f30088485a24e369798336110ab11f22cbe37a3.tar nixpkgs-7f30088485a24e369798336110ab11f22cbe37a3.tar.gz nixpkgs-7f30088485a24e369798336110ab11f22cbe37a3.tar.bz2 nixpkgs-7f30088485a24e369798336110ab11f22cbe37a3.tar.lz nixpkgs-7f30088485a24e369798336110ab11f22cbe37a3.tar.xz nixpkgs-7f30088485a24e369798336110ab11f22cbe37a3.tar.zst nixpkgs-7f30088485a24e369798336110ab11f22cbe37a3.zip | |
fbida: pull upstream fix for -fno-common compiler
| -rw-r--r-- | pkgs/applications/graphics/fbida/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index f2d2e267595..279f49e6a49 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; + patches = [ + # Upstream patch to fix build on -fno-common toolchains. + (fetchurl { + name = "no-common.patch"; + url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2"; + sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi"; + }) + ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp @@ -19,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; - patchPhase = '' + postPatch = '' sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile ''; |