From d0630da09e3e5da7647fe14d4ef7d2536f916150 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 30 Apr 2016 03:01:32 +0300 Subject: [PATCH] libiberty: derive from gcc --- .../libraries/libiberty/default.nix | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index c3dc3a4e852..1f5ab2cf096 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,26 +1,16 @@ -{ stdenv, fetchurl, staticBuild ? false }: +{ stdenv, lib, fetchurl, gcc, staticBuild ? false }: stdenv.mkDerivation rec { - version = "4.9.3"; - name = "libiberty-${version}"; + name = "libiberty-${gcc.cc.version}"; - src = fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3"; - }; + inherit (gcc.cc) src; postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; - enable_shared = !staticBuild; + configureFlags = [ "--enable-install-libiberty" ] ++ lib.optional (!staticBuild) "--enable-shared"; - installPhase = '' - mkdir -p $out/lib $out/include - cp ../include/libiberty.h $out/include/ - if [ -z "$enabled_shared" ]; then - cp libiberty.a $out/lib/libiberty.a - else - cp pic/libiberty.a $out/lib/libiberty_pic.a - fi + postInstall = lib.optionalString (!staticBuild) '' + cp pic/libiberty.a $out/lib*/libiberty.a ''; meta = with stdenv.lib; {