tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

afterstep: apply debian patch to build with recent gcc

Maximilian Bosch 871e262d d0743cc2

+8 -1
unified split
+8
pkgs/applications/window-managers/afterstep/default.nix
··· 3 , fltk, gtk 4 , libX11, libXext, libICE 5 , dbus 6 }: 7 8 stdenv.mkDerivation rec { ··· 15 urls = [ "ftp://ftp.afterstep.org/stable/${sourceName}.tar.bz2" ]; 16 sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz"; 17 }; 18 19 nativeBuildInputs = [ pkgconfig ]; 20 buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ];
··· 3 , fltk, gtk 4 , libX11, libXext, libICE 5 , dbus 6 + , fetchpatch 7 }: 8 9 stdenv.mkDerivation rec { ··· 16 urls = [ "ftp://ftp.afterstep.org/stable/${sourceName}.tar.bz2" ]; 17 sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz"; 18 }; 19 + 20 + patches = [ 21 + (fetchpatch { 22 + url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch"; 23 + sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4"; 24 + }) 25 + ]; 26 27 nativeBuildInputs = [ pkgconfig ]; 28 buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ];
-1
pkgs/top-level/all-packages.nix
··· 18056 afterstep = callPackage ../applications/window-managers/afterstep { 18057 fltk = fltk13; 18058 gtk = gtk2; 18059 - stdenv = gcc49Stdenv; 18060 }; 18061 18062 agedu = callPackage ../tools/misc/agedu { };
··· 18056 afterstep = callPackage ../applications/window-managers/afterstep { 18057 fltk = fltk13; 18058 gtk = gtk2; 18059 }; 18060 18061 agedu = callPackage ../tools/misc/agedu { };