Merge pull request #121563 from austinbutler/wrap

This commit is contained in:
Doron Behar 2021-05-14 05:50:35 +00:00 committed by GitHub
commit 210784b7c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 5 deletions

View file

@ -4,7 +4,7 @@
, unwrapped
# If it's a minimal build, we don't want to wrap it with lndir and
# wrapProgram..
, wrap ? true
, doWrap ? true
# For the wrapper
, makeWrapper
# For lndir
@ -138,7 +138,7 @@ let
;
pkgs = packages;
};
self = if wrap then
self = if doWrap then
stdenv.mkDerivation {
inherit name passthru;
buildInputs = [

View file

@ -0,0 +1,36 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeWrapper, courier-prime }:
buildGoModule rec {
pname = "wrap";
version = "0.3.1";
src = fetchFromGitHub {
owner = "Wraparound";
repo = "wrap";
rev = "v${version}";
sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77";
};
nativeBuildInputs = [ makeWrapper ];
vendorSha256 = "03q5a5lm8zj1523gxkbc0y6a3mjj1z2h7nrr2qcz8nlghvp4cfaz";
patches = [
(fetchpatch {
name = "courier-prime-variants.patch";
url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch";
sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5";
})
];
postInstall = ''
wrapProgram $out/bin/wrap --prefix XDG_DATA_DIRS : ${courier-prime}/share/
'';
meta = with lib; {
description = "A Fountain export tool with some extras";
homepage = "https://github.com/Wraparound/wrap";
license = licenses.gpl3Only;
maintainers = [ maintainers.austinbutler ];
};
}

View file

@ -9710,6 +9710,8 @@ in
wpgtk = callPackage ../tools/X11/wpgtk { };
wrap = callPackage ../tools/text/wrap { };
wring = nodePackages.wring;
wrk = callPackage ../tools/networking/wrk { };
@ -23167,7 +23169,7 @@ in
# A build without gui components and other utilites not needed for end user
# libraries
gnuradioMinimal = gnuradio.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio.unwrapped.override {
volk = volk.override {
# So it will not reference python
@ -23197,7 +23199,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_8Minimal = gnuradio3_8.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio3_8.unwrapped.override {
volk = volk.override {
enableModTool = false;
@ -23226,7 +23228,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_7Minimal = gnuradio3_7.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio3_7.unwrapped.override {
volk = volk.override {
enableModTool = false;