disk_indicator: unstable-2014-05-19 -> unstable-2018-12-18

Among other things pull in fix fo r-fno-common toolchains.

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