public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

afterstep: apply debian patch to build with recent gcc

Browse Source
This commit is contained in:
Maximilian Bosch 2020-01-18 00:27:35 +01:00
parent d0743cc2f6
commit 871e262dd6
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/window-managers/afterstep/default.nix
View File

@ -3,6 +3,7 @@
, fltk, gtk , fltk, gtk
, libX11, libXext, libICE , libX11, libXext, libICE
, dbus , dbus
, fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,6 +17,13 @@ stdenv.mkDerivation rec {
sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz"; sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz";
}; };
patches = [
(fetchpatch {
url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch";
sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4";
})
];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ];

1
pkgs/top-level/all-packages.nix
View File

@ -18056,7 +18056,6 @@ in
afterstep = callPackage ../applications/window-managers/afterstep { afterstep = callPackage ../applications/window-managers/afterstep {
fltk = fltk13; fltk = fltk13;
gtk = gtk2; gtk = gtk2;
stdenv = gcc49Stdenv;
}; };
agedu = callPackage ../tools/misc/agedu { }; agedu = callPackage ../tools/misc/agedu { };