diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-13 21:03:00 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-05-13 21:04:18 +0100 |
| commit | dac345515807018ee89d46b510073788b4ba7cf4 (patch) | |
| tree | db6e9af5c8477c1f48f7ac86e639ab75f1d57969 /pkgs/os-specific/linux/disk-indicator/default.nix | |
| parent | 197681059f0fff10d7abd75d11f36654ea063e92 (diff) | |
| download | nixpkgs-dac345515807018ee89d46b510073788b4ba7cf4.tar nixpkgs-dac345515807018ee89d46b510073788b4ba7cf4.tar.gz nixpkgs-dac345515807018ee89d46b510073788b4ba7cf4.tar.bz2 nixpkgs-dac345515807018ee89d46b510073788b4ba7cf4.tar.lz nixpkgs-dac345515807018ee89d46b510073788b4ba7cf4.tar.xz nixpkgs-dac345515807018ee89d46b510073788b4ba7cf4.tar.zst nixpkgs-dac345515807018ee89d46b510073788b4ba7cf4.zip | |
disk_indicator: unstable-2014-05-19 -> unstable-2018-12-18
Among other things pull in fix fo r-fno-common toolchains.
Diffstat (limited to 'pkgs/os-specific/linux/disk-indicator/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/disk-indicator/default.nix | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 44dd19b27df..f5c7f3bc774 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -2,31 +2,40 @@ stdenv.mkDerivation { pname = "disk-indicator"; - version = "unstable-2014-05-19"; + version = "unstable-2018-12-18"; src = fetchFromGitHub { owner = "MeanEYE"; repo = "Disk-Indicator"; - rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; - sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI="; + rev = "ec2d2f6833f038f07a72d15e2d52625c23e10b12"; + sha256 = "sha256-cRqgIxF6H1WyJs5hhaAXVdWAlv6t22BZLp3p/qRlCSM="; }; buildInputs = [ libX11 ]; - patchPhase = '' - substituteInPlace ./makefile --replace "COMPILER=c99" "COMPILER=gcc -std=c99" - substituteInPlace ./makefile --replace "COMPILE_FLAGS=" "COMPILE_FLAGS=-O2 " + postPatch = '' + # avoid -Werror + substituteInPlace Makefile --replace "-Werror" "" + # avoid host-specific options + substituteInPlace Makefile --replace "-march=native" "" ''; - buildPhase = "make -f makefile"; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + postConfigure = '' + patchShebangs ./configure.sh + ./configure.sh --all + ''; - hardeningDisable = [ "fortify" ]; + makeFlags = [ + "COMPILER=${stdenv.cc.targetPrefix}cc" + ]; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp ./disk_indicator "$out/bin/" + + runHook postInstall ''; meta = { |