pyrox.dev
Merge pull request #171844 from trofi/fix-fno-common-for-wmfs
wmfs: fix build on -fno-common toolchain
+12
-1
pkgs/applications/window-managers/wmfs/default.nix
+12
-1
pkgs/applications/window-managers/wmfs/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub,
2
libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
3
stdenv.mkDerivation {
4
pname = "wmfs";
···
11
sha256 = "1m7dsmmlhq2qipim659cp9aqlriz1cwrrgspl8baa5pncln0gd5c";
12
rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2";
13
};
14
15
buildInputs = [
16
imlib2
···
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch,
2
libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
3
stdenv.mkDerivation {
4
pname = "wmfs";
···
11
sha256 = "1m7dsmmlhq2qipim659cp9aqlriz1cwrrgspl8baa5pncln0gd5c";
12
rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2";
13
};
14
+
15
+
patches = [
16
+
# Pull patch pending upstream inclusion to fix build on
17
+
# -fno-common toolchain like upstream gcc-10:
18
+
# https://github.com/xorg62/wmfs/pull/104
19
+
(fetchpatch {
20
+
name = "fno-common.patch";
21
+
url = "https://github.com/xorg62/wmfs/commit/e4ec12618f4689d791892ebb49df9610a25d24d3.patch";
22
+
sha256 = "0qvwry9sikvr85anzha9x4gcx0r2ckwdxqw2in2l6bl9z9d9c0w2";
23
+
})
24
+
];
25
26
buildInputs = [
27
imlib2