diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-18 00:27:35 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-28 20:11:01 +0100 |
commit | 871e262dd661360cfa91c5cc3893dcdbf8f2e81a (patch) | |
tree | e5bbb2c3dc618c05f13a90667de335f0b5eed0ef | |
parent | d0743cc2f6d091ea2c6175ecf94fd2e474907f2b (diff) | |
download | nixlib-871e262dd661360cfa91c5cc3893dcdbf8f2e81a.tar nixlib-871e262dd661360cfa91c5cc3893dcdbf8f2e81a.tar.gz nixlib-871e262dd661360cfa91c5cc3893dcdbf8f2e81a.tar.bz2 nixlib-871e262dd661360cfa91c5cc3893dcdbf8f2e81a.tar.lz nixlib-871e262dd661360cfa91c5cc3893dcdbf8f2e81a.tar.xz nixlib-871e262dd661360cfa91c5cc3893dcdbf8f2e81a.tar.zst nixlib-871e262dd661360cfa91c5cc3893dcdbf8f2e81a.zip |
afterstep: apply debian patch to build with recent gcc
-rw-r--r-- | pkgs/applications/window-managers/afterstep/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 5fcbff26b154..7e68de8393fd 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -3,6 +3,7 @@ , fltk, gtk , libX11, libXext, libICE , dbus +, fetchpatch }: stdenv.mkDerivation rec { @@ -16,6 +17,13 @@ stdenv.mkDerivation rec { 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 ]; buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a50205aa867..600217979002 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18056,7 +18056,6 @@ in afterstep = callPackage ../applications/window-managers/afterstep { fltk = fltk13; gtk = gtk2; - stdenv = gcc49Stdenv; }; agedu = callPackage ../tools/misc/agedu { }; |