diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-10-14 11:30:59 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-13 00:30:53 -0500 |
| commit | c0a04ec2f537d21ab18d72d67cc65fe651598e14 (patch) | |
| tree | 9ee78713958618a4c083b9b179bd5e7e4e0e02d2 | |
| parent | 9ea242c617bf6fca9b425b5199a26294a406cbc0 (diff) | |
| download | nixpkgs-c0a04ec2f537d21ab18d72d67cc65fe651598e14.tar nixpkgs-c0a04ec2f537d21ab18d72d67cc65fe651598e14.tar.gz nixpkgs-c0a04ec2f537d21ab18d72d67cc65fe651598e14.tar.bz2 nixpkgs-c0a04ec2f537d21ab18d72d67cc65fe651598e14.tar.lz nixpkgs-c0a04ec2f537d21ab18d72d67cc65fe651598e14.tar.xz nixpkgs-c0a04ec2f537d21ab18d72d67cc65fe651598e14.tar.zst nixpkgs-c0a04ec2f537d21ab18d72d67cc65fe651598e14.zip | |
libiberty: Add dev output
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/libiberty/default.nix | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a29d4d308e8..f09869cda2d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -205,6 +205,7 @@ eqyiel = "Ruben Maher <r@rkm.id.au>"; ericbmerritt = "Eric Merritt <eric@afiniate.com>"; ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>"; + ericson2314 = "John Ericson <John.Ericson@Obsidian.Systems>"; erictapen = "Justin Humm <justin.humm@posteo.de>"; erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>"; ertes = "Ertugrul Söylemez <esz@posteo.de>"; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 1f5ab2cf096..6608a3393b1 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,15 +1,18 @@ -{ stdenv, lib, fetchurl, gcc, staticBuild ? false }: +{ stdenv, fetchurl, gcc, staticBuild ? false }: stdenv.mkDerivation rec { name = "libiberty-${gcc.cc.version}"; inherit (gcc.cc) src; + outputs = [ "out" "dev" ]; + postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; - configureFlags = [ "--enable-install-libiberty" ] ++ lib.optional (!staticBuild) "--enable-shared"; + configureFlags = [ "--enable-install-libiberty" ] + ++ stdenv.lib.optional (!staticBuild) "--enable-shared"; - postInstall = lib.optionalString (!staticBuild) '' + postInstall = stdenv.lib.optionalString (!staticBuild) '' cp pic/libiberty.a $out/lib*/libiberty.a ''; @@ -17,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://gcc.gnu.org/; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar ericson2314 ]; platforms = platforms.unix; }; } |