pyrox.dev
disk_indicator: unstable-2014-05-19 -> unstable-2018-12-18
Among other things pull in fix fo r-fno-common toolchains.
+19
-10
pkgs/os-specific/linux/disk-indicator/default.nix
+19
-10
pkgs/os-specific/linux/disk-indicator/default.nix
···
2
2
3
3
stdenv.mkDerivation {
4
4
pname = "disk-indicator";
5
-
version = "unstable-2014-05-19";
5
+
version = "unstable-2018-12-18";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "MeanEYE";
9
9
repo = "Disk-Indicator";
10
-
rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da";
11
-
sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI=";
10
+
rev = "ec2d2f6833f038f07a72d15e2d52625c23e10b12";
11
+
sha256 = "sha256-cRqgIxF6H1WyJs5hhaAXVdWAlv6t22BZLp3p/qRlCSM=";
12
12
};
13
13
14
14
buildInputs = [ libX11 ];
15
15
16
-
patchPhase = ''
17
-
substituteInPlace ./makefile --replace "COMPILER=c99" "COMPILER=gcc -std=c99"
18
-
substituteInPlace ./makefile --replace "COMPILE_FLAGS=" "COMPILE_FLAGS=-O2 "
16
+
postPatch = ''
17
+
# avoid -Werror
18
+
substituteInPlace Makefile --replace "-Werror" ""
19
+
# avoid host-specific options
20
+
substituteInPlace Makefile --replace "-march=native" ""
19
21
'';
20
22
21
-
buildPhase = "make -f makefile";
23
+
postConfigure = ''
24
+
patchShebangs ./configure.sh
25
+
./configure.sh --all
26
+
'';
22
27
23
-
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
24
-
25
-
hardeningDisable = [ "fortify" ];
28
+
makeFlags = [
29
+
"COMPILER=${stdenv.cc.targetPrefix}cc"
30
+
];
26
31
27
32
installPhase = ''
33
+
runHook preInstall
34
+
28
35
mkdir -p "$out/bin"
29
36
cp ./disk_indicator "$out/bin/"
37
+
38
+
runHook postInstall
30
39
'';
31
40
32
41
meta = {