programs/assorted: prefer makeBinaryWrapper over makeWrapper
This commit is contained in:
parent
b2f36e4ef6
commit
631c47c9bc
@ -95,7 +95,7 @@ in
|
|||||||
|
|
||||||
packageUnwrapped = pkgs.bemenu.overrideAttrs (upstream: {
|
packageUnwrapped = pkgs.bemenu.overrideAttrs (upstream: {
|
||||||
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
|
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
|
||||||
pkgs.makeWrapper
|
pkgs.makeBinaryWrapper
|
||||||
];
|
];
|
||||||
# can alternatively be specified as CLI flags
|
# can alternatively be specified as CLI flags
|
||||||
postInstall = (upstream.postInstall or "") + ''
|
postInstall = (upstream.postInstall or "") + ''
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
sane.programs.s6-rc = {
|
sane.programs.s6-rc = {
|
||||||
packageUnwrapped = pkgs.s6-rc.overrideAttrs (upstream: {
|
packageUnwrapped = pkgs.s6-rc.overrideAttrs (upstream: {
|
||||||
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ (with pkgs; [
|
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ (with pkgs; [
|
||||||
makeWrapper
|
makeBinaryWrapper
|
||||||
]);
|
]);
|
||||||
# s6-rc looks for files in /run/s6/{live,compiled,...} by default.
|
# s6-rc looks for files in /run/s6/{live,compiled,...} by default.
|
||||||
# let's patch that to be a user-specific runtime dir, since i run it as an ordinary user.
|
# let's patch that to be a user-specific runtime dir, since i run it as an ordinary user.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ buildGoModule
|
{ buildGoModule
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, lib
|
, lib
|
||||||
, makeWrapper
|
, makeBinaryWrapper
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, pulseaudio
|
, pulseaudio
|
||||||
}:
|
}:
|
||||||
@ -19,7 +19,7 @@ buildGoModule rec {
|
|||||||
vendorHash = "sha256-yPwLilMiDR1aSeuk8AEmuYPsHPRWqiByGLwgkdI5t+s=";
|
vendorHash = "sha256-yPwLilMiDR1aSeuk8AEmuYPsHPRWqiByGLwgkdI5t+s=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
makeBinaryWrapper
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -20,7 +20,9 @@ in
|
|||||||
(symlinkJoin {
|
(symlinkJoin {
|
||||||
name = "${gpodder.pname}-configured";
|
name = "${gpodder.pname}-configured";
|
||||||
paths = [ gpodder remove-extra ];
|
paths = [ gpodder remove-extra ];
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [
|
||||||
|
makeWrapper
|
||||||
|
];
|
||||||
|
|
||||||
# gpodder keeps all its feeds in a sqlite3 database.
|
# gpodder keeps all its feeds in a sqlite3 database.
|
||||||
# we can configure the feeds externally by wrapping gpodder and just instructing it to import
|
# we can configure the feeds externally by wrapping gpodder and just instructing it to import
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
, git
|
, git
|
||||||
, libtool
|
, libtool
|
||||||
, luajit
|
, luajit
|
||||||
, makeWrapper
|
, makeBinaryWrapper
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, stdenv
|
, stdenv
|
||||||
, symlinkJoin
|
, symlinkJoin
|
||||||
@ -482,7 +482,7 @@ stdenv.mkDerivation rec {
|
|||||||
cmake # for koreader/base submodule
|
cmake # for koreader/base submodule
|
||||||
git
|
git
|
||||||
libtool
|
libtool
|
||||||
makeWrapper
|
makeBinaryWrapper
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
{ pkgs
|
{
|
||||||
, bash
|
pkgs,
|
||||||
, lib
|
bash,
|
||||||
, makeWrapper
|
lib,
|
||||||
, python3
|
makeBinaryWrapper,
|
||||||
, stdenv
|
python3,
|
||||||
, zsh
|
stdenv,
|
||||||
|
zsh,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -76,19 +77,21 @@ in rec {
|
|||||||
# allow any package to be a list of packages, to support things like
|
# allow any package to be a list of packages, to support things like
|
||||||
# -p python3.pkgs.foo.propagatedBuildInputs
|
# -p python3.pkgs.foo.propagatedBuildInputs
|
||||||
pkgsEnv' = lib.flatten pkgsEnv;
|
pkgsEnv' = lib.flatten pkgsEnv;
|
||||||
doWrap = pkgsEnv' != [];
|
|
||||||
|
makeWrapperArgs = lib.optionals (pkgsEnv' != []) [
|
||||||
|
"--suffix" "PATH" ":" (lib.makeBinPath pkgsEnv')
|
||||||
|
] ++ extraMakeWrapperArgs;
|
||||||
|
doWrap = makeWrapperArgs != [];
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (final: {
|
stdenv.mkDerivation (final: {
|
||||||
version = "0.1.0"; # default version
|
version = "0.1.0"; # default version
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
|
|
||||||
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [
|
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [
|
||||||
makeWrapper
|
makeBinaryWrapper
|
||||||
];
|
];
|
||||||
|
|
||||||
makeWrapperArgs = [
|
inherit makeWrapperArgs;
|
||||||
"--suffix" "PATH" ":" (lib.makeBinPath pkgsEnv')
|
|
||||||
] ++ extraMakeWrapperArgs;
|
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
substituteInPlace ${srcPath} \
|
substituteInPlace ${srcPath} \
|
||||||
|
Loading…
Reference in New Issue
Block a user