Merge pull request #193494 from NixOS/staging-next
This commit is contained in:
Martin Weinelt
GitHub
commit
cf7f4393f3
287 changed files with 4128 additions and 758 deletions
|
|
@ -622,6 +622,20 @@ rec {
|
|||
dontRecurseIntoAttrs =
|
||||
attrs: attrs // { recurseForDerivations = false; };
|
||||
|
||||
/* `unionOfDisjoint x y` is equal to `x // y // z` where the
|
||||
attrnames in `z` are the intersection of the attrnames in `x` and
|
||||
`y`, and all values `assert` with an error message. This
|
||||
operator is commutative, unlike (//). */
|
||||
unionOfDisjoint = x: y:
|
||||
let
|
||||
intersection = builtins.intersectAttrs x y;
|
||||
collisions = lib.concatStringsSep " " (builtins.attrNames intersection);
|
||||
mask = builtins.mapAttrs (name: value: builtins.throw
|
||||
"unionOfDisjoint: collision on ${name}; complete list: ${collisions}")
|
||||
intersection;
|
||||
in
|
||||
(x // y) // mask;
|
||||
|
||||
/*** deprecated stuff ***/
|
||||
|
||||
zipWithNames = zipAttrsWithNames;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
stdenv.mkDerivation {
|
||||
name = "nix-generate-from-cpan-3";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = with perlPackages; [
|
||||
makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
|
||||
perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
|
||||
];
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ in {
|
|||
each user that tries to use the sound system. The server runs
|
||||
with user privileges. If true, one system-wide PulseAudio
|
||||
server is launched on boot, running as the user "pulse", and
|
||||
only users in the "audio" group will have access to the server.
|
||||
only users in the "pulse-access" group will have access to the server.
|
||||
Please read the PulseAudio documentation for more details.
|
||||
|
||||
Don't enable this option unless you know what you are doing.
|
||||
|
|
@ -310,6 +310,7 @@ in {
|
|||
};
|
||||
|
||||
users.groups.pulse.gid = gid;
|
||||
users.groups.pulse-access = {};
|
||||
|
||||
systemd.services.pulseaudio = {
|
||||
description = "PulseAudio System-Wide Server";
|
||||
|
|
|
|||
|
|
@ -23,8 +23,10 @@ in
|
|||
runCommand "uvcdynctrl-udev-rules-${version}"
|
||||
{
|
||||
inherit dataPath;
|
||||
buildInputs = [
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
libwebcam
|
||||
];
|
||||
dontPatchELF = true;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ let
|
|||
pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);
|
||||
|
||||
mnexecWrapped = pkgs.runCommand "mnexec-wrapper"
|
||||
{ buildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; }
|
||||
{ nativeBuildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; }
|
||||
''
|
||||
makeWrapper ${pkgs.mininet}/bin/mnexec \
|
||||
$out/bin/mnexec \
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ let
|
|||
name = "mopidy-with-extensions-${mopidy.version}";
|
||||
paths = closePropagation cfg.extensionPackages;
|
||||
pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ];
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postBuild = ''
|
||||
makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
|
||||
--prefix PYTHONPATH : $out/${mopidyPackages.python.sitePackages}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ let
|
|||
original, name, set ? {}
|
||||
}:
|
||||
pkgs.runCommand "${name}-wrapper" {
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
} (with lib; ''
|
||||
makeWrapper "${original}" "$out/bin/${name}" \
|
||||
${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ let
|
|||
makeWrapperArgs = concatStringsSep " " (mapAttrsToList (key: value: "--set \"${key}\" \"${value}\"") hydraEnv);
|
||||
in pkgs.buildEnv rec {
|
||||
name = "hydra-env";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
paths = [ cfg.package ];
|
||||
|
||||
postBuild = ''
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ in
|
|||
|
||||
environment.systemPackages = with pkgs; [
|
||||
(runCommand "etebase-server" {
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
makeWrapper ${pythonEnv}/bin/etebase-server \
|
||||
$out/bin/etebase-server \
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ let
|
|||
|
||||
gitlab-rake = pkgs.stdenv.mkDerivation {
|
||||
name = "gitlab-rake";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
|
|
@ -220,7 +220,7 @@ let
|
|||
|
||||
gitlab-rails = pkgs.stdenv.mkDerivation {
|
||||
name = "gitlab-rails";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ let
|
|||
|
||||
knot-cli-wrappers = pkgs.stdenv.mkDerivation {
|
||||
name = "knot-cli-wrappers";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${cfg.package}/bin/knotc "$out/bin/knotc" \
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ with lib;
|
|||
ppp-pptpd-wrapped = pkgs.stdenv.mkDerivation {
|
||||
name = "ppp-pptpd-wrapped";
|
||||
phases = [ "installPhase" ];
|
||||
buildInputs = with pkgs; [ makeWrapper ];
|
||||
nativeBuildInputs = with pkgs; [ makeWrapper ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${pkgs.ppp}/bin/pppd $out/bin/pppd \
|
||||
|
|
|
|||
|
|
@ -410,7 +410,7 @@ in
|
|||
environment.systemPackages = let
|
||||
cli-wrappers = pkgs.stdenv.mkDerivation {
|
||||
name = "tinc-cli-wrappers";
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
${concatStringsSep "\n" (mapAttrsToList (network: data:
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ with lib;
|
|||
xl2tpd-ppp-wrapped = pkgs.stdenv.mkDerivation {
|
||||
name = "xl2tpd-ppp-wrapped";
|
||||
phases = [ "installPhase" ];
|
||||
buildInputs = with pkgs; [ makeWrapper ];
|
||||
nativeBuildInputs = with pkgs; [ makeWrapper ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ let
|
|||
};
|
||||
|
||||
mediawikiScripts = pkgs.runCommand "mediawiki-scripts" {
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
preferLocalBuild = true;
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ let
|
|||
|
||||
patches = [ ./azure-agent-entropy.patch ];
|
||||
|
||||
buildInputs = [ makeWrapper python pythonPackages.wrapPython ];
|
||||
nativeBuildInputs = [ makeWrapper python pythonPackages.wrapPython ];
|
||||
runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh
|
||||
nettools # for hostname
|
||||
procps # for pidof
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
createTrivialProject = pkgs.stdenv.mkDerivation {
|
||||
name = "create-trivial-project";
|
||||
dontUnpack = true;
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ let
|
|||
${master.ip} api.${domain}
|
||||
${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)}
|
||||
'';
|
||||
wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } ''
|
||||
wrapKubectl = with pkgs; runCommand "wrap-kubectl" { nativeBuildInputs = [ makeWrapper ]; } ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
let
|
||||
mkTest = { systemWide ? false }:
|
||||
mkTest = { systemWide ? false , fullVersion ? false }:
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
let
|
||||
testFile = pkgs.fetchurl {
|
||||
url =
|
||||
"https://file-examples-com.github.io/uploads/2017/11/file_example_MP3_700KB.mp3";
|
||||
"https://file-examples.com/storage/fe5947fd2362fc197a3c2df/2017/11/file_example_MP3_700KB.mp3";
|
||||
hash = "sha256-+iggJW8s0/LfA/okfXsB550/55Q0Sq3OoIzuBrzOPJQ=";
|
||||
};
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ let
|
|||
testPlay32 = { inherit (pkgs.pkgsi686Linux) sox alsa-utils; };
|
||||
};
|
||||
in {
|
||||
name = "pulseaudio${lib.optionalString systemWide "-systemWide"}";
|
||||
name = "pulseaudio${lib.optionalString fullVersion "Full"}${lib.optionalString systemWide "-systemWide"}";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ synthetica ] ++ pkgs.pulseaudio.meta.maintainers;
|
||||
};
|
||||
|
|
@ -35,12 +35,14 @@ let
|
|||
enable = true;
|
||||
support32Bit = true;
|
||||
inherit systemWide;
|
||||
} // lib.optionalAttrs fullVersion {
|
||||
package = pkgs.pulseaudioFull;
|
||||
};
|
||||
|
||||
environment.systemPackages = [ testers.testPlay pkgs.pavucontrol ]
|
||||
++ lib.optional pkgs.stdenv.isx86_64 testers.testPlay32;
|
||||
} // lib.optionalAttrs systemWide {
|
||||
users.users.alice.extraGroups = [ "audio" ];
|
||||
users.users.alice.extraGroups = [ "pulse-access" ];
|
||||
systemd.services.pulseaudio.wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
|
|
@ -58,14 +60,21 @@ let
|
|||
''}
|
||||
machine.screenshot("testPlay")
|
||||
|
||||
${lib.optionalString (!systemWide) ''
|
||||
machine.send_chars("pacmd info && touch /tmp/pacmd_success\n")
|
||||
machine.wait_for_file("/tmp/pacmd_success")
|
||||
''}
|
||||
|
||||
# Pavucontrol only loads when Pulseaudio is running. If it isn't, the
|
||||
# text "Playback" (one of the tabs) will never show.
|
||||
# text "Dummy Output" (sound device name) will never show.
|
||||
machine.send_chars("pavucontrol\n")
|
||||
machine.wait_for_text("Playback")
|
||||
machine.wait_for_text("Dummy Output")
|
||||
machine.screenshot("Pavucontrol")
|
||||
'';
|
||||
});
|
||||
in builtins.mapAttrs (key: val: mkTest val) {
|
||||
user = { systemWide = false; };
|
||||
system = { systemWide = true; };
|
||||
user = { systemWide = false; fullVersion = false; };
|
||||
system = { systemWide = true; fullVersion = false; };
|
||||
userFull = { systemWide = false; fullVersion = true; };
|
||||
systemFull = { systemWide = true; fullVersion = true; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,12 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals gtkGUI [ pkg-config ];
|
||||
|
||||
buildInputs = [ gettext ncurses ]
|
||||
++ lib.optionals gtkGUI [ pkg-config gtk2 ];
|
||||
++ lib.optionals gtkGUI [ gtk2 ];
|
||||
|
||||
configureFlags = lib.optionals (!gtkGUI) ["--without-gtk"];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Audio mixer for X and the console";
|
||||
|
|
|
|||
|
|
@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
|
||||
libglade lv2 pkg-config
|
||||
libglade lv2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flac";
|
||||
version = "1.3.4";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/flac/${pname}-${version}.tar.xz";
|
||||
sha256 = "0dz7am8kbc97a6afml1h4yp085274prg8j7csryds8m3fmz61w4g";
|
||||
# Official checksum is published at https://github.com/xiph/flac/releases/tag/${version}
|
||||
sha256 = "91303c3e5dfde52c3e94e75976c0ab3ee14ced278ab8f60033a3a12db9209ae6";
|
||||
};
|
||||
|
||||
buildInputs = [ libogg ];
|
||||
|
|
@ -20,5 +21,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
|
||||
platforms = platforms.all;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ruuda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ]
|
||||
buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ]
|
||||
++ lib.optional jackaudioSupport libjack2;
|
||||
|
||||
cmakeFlags = lib.optional (!jackaudioSupport) [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al";
|
||||
};
|
||||
|
||||
buildInputs = [ pkg-config libltc libsndfile jack2 ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libltc libsndfile jack2 ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs =
|
||||
[ pkg-config SDL SDL_image libjack2
|
||||
[ SDL SDL_image libjack2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA=";
|
||||
};
|
||||
|
||||
buildInputs = [ lv2 pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ lv2 ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl libogg ];
|
||||
propagatedBuildInputs = [ libopus ];
|
||||
outputs = [ "out" "dev" ];
|
||||
patches = [ ./include-multistream.patch ]
|
||||
# fixes problem with openssl 1.1 dependency
|
||||
# see https://github.com/xiph/opusfile/issues/13
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
boost
|
||||
|
|
@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||
glibmm
|
||||
gtkmm2
|
||||
libjack2
|
||||
pkg-config
|
||||
python3
|
||||
wafHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchCrate, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchCrate
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, openssl
|
||||
, python3
|
||||
, libxcb
|
||||
, AppKit
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "spotify-tui";
|
||||
|
|
@ -8,14 +21,30 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "Rigellute";
|
||||
repo = "spotify-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";
|
||||
hash = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";
|
||||
};
|
||||
|
||||
# Use patched rspotify
|
||||
cargoPatches = [
|
||||
# Use patched rspotify
|
||||
./Cargo.lock.patch
|
||||
|
||||
# Needed so that the patch below it applies.
|
||||
(fetchpatch {
|
||||
name = "update-dirs.patch";
|
||||
url = "https://github.com/Rigellute/spotify-tui/commit/3881defc1ed0bcf79df1aef4836b857f64be657c.patch";
|
||||
hash = "sha256-OGqiYLFojMwR3RgKbddXxPDiAdzPySnscVVsVmTT7t4=";
|
||||
})
|
||||
|
||||
# https://github.com/Rigellute/spotify-tui/pull/990
|
||||
(fetchpatch {
|
||||
name = "update-socket2-for-rust-1.64.patch";
|
||||
url = "https://github.com/Rigellute/spotify-tui/commit/14df9419cf72da13f3b55654686a95647ea9dfea.patch";
|
||||
hash = "sha256-craY6UwmHDdxih3nZBdPkNJtQ6wvVgf09Ovqdxi0JZo=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Use patched rspotify
|
||||
./Cargo.toml.patch
|
||||
];
|
||||
|
||||
|
|
@ -44,7 +73,7 @@ rustPlatform.buildRustPackage rec {
|
|||
ln -s ${rspotify} ./rspotify-${rspotify.version}
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-S8zuVYcyYvrwggIvlpxNydhoN9kx6xLBwYJSHcbEK40=";
|
||||
cargoHash = "sha256-aZJ6Q/rvqrv+wvQw2eKFPnSROhI5vXPvr5pu1hwtZKA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];
|
||||
buildInputs = [ ]
|
||||
|
|
|
|||
|
|
@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo
|
||||
libdvdread pkg-config x264 libmpeg2 xvidcore ];
|
||||
libdvdread x264 libmpeg2 xvidcore ];
|
||||
configureFlags = [
|
||||
"--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat"
|
||||
"--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2"
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
nativeBuildInputs = [ autoconf automake pkg-config ];
|
||||
buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH
|
||||
ladspaPlugins liblo pkg-config ];
|
||||
ladspaPlugins liblo ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
|||
postPatch = ''
|
||||
# Have to do this here instead of in preConfigure because
|
||||
# cargoDepsCopy gets unset after postPatch.
|
||||
configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy")
|
||||
configureFlagsArray+=("RUST_VENDORED_SOURCES=$cargoDepsCopy")
|
||||
'';
|
||||
|
||||
CXXFLAGS = [
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool gtk2 ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk2 ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ let
|
|||
inherit (stdenv.hostPlatform) system;
|
||||
}).nodeDependencies.override (old: {
|
||||
inherit src version;
|
||||
buildInputs = [pkg-config libsecret];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [libsecret];
|
||||
dontNpmInstall = true;
|
||||
}));
|
||||
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configurePhase = ''
|
||||
export GIT_VERSION=${builtins.substring 0 7 src.rev}
|
||||
buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}"
|
||||
buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES"
|
||||
'' + optionalString enableX11 ''
|
||||
cd x11
|
||||
substituteInPlace Makefile.am \
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
|
|||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [
|
||||
gtk3 udev desktop-file-utils shared-mime-info intltool
|
||||
gtk3 udev desktop-file-utils shared-mime-info
|
||||
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2
|
||||
] ++ (if ifuseSupport then [ ifuse ] else []);
|
||||
# Introduced because ifuse doesn't build due to CVEs in libplist
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ fox gettext xlibsWrapper gcc file libpng ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
, virtualpg
|
||||
, wxGTK
|
||||
, wxmac
|
||||
, xz
|
||||
, zstd
|
||||
, Carbon
|
||||
, Cocoa
|
||||
|
|
@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
|
|||
proj
|
||||
sqlite
|
||||
virtualpg
|
||||
xz
|
||||
zstd
|
||||
] ++ lib.optional stdenv.isLinux wxGTK
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
|
||||
buildInputs = [ intltool gtk2 ];
|
||||
buildInputs = [ gtk2 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple and fast image viewer for X";
|
||||
|
|
|
|||
|
|
@ -114,7 +114,6 @@ stdenv.mkDerivation {
|
|||
gtk3
|
||||
gtkmm3
|
||||
imagemagick
|
||||
intltool
|
||||
libjack2
|
||||
libsigcxx
|
||||
libxmlxx
|
||||
|
|
|
|||
|
|
@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [
|
||||
aalib gsl libpng libX11 xorgproto libXext
|
||||
libXt zlib gettext intltool perl
|
||||
libXt zlib gettext perl
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
|
|||
"--enable-SIGCHLD-fallback"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
Xaw3d
|
||||
ghostscriptX
|
||||
perl
|
||||
pkg-config
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool gtk3 texinfo ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk3 texinfo ];
|
||||
|
||||
meta = {
|
||||
description = "A GTK enabled dropin replacement for xmessage";
|
||||
|
|
|
|||
|
|
@ -8,10 +8,15 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "mdzk-rs";
|
||||
repo = "mdzk";
|
||||
rev = version;
|
||||
sha256 = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs=";
|
||||
hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2lPckUhnyfHaVWXzZXKliolDZiPtNl9UBZIKs6tUaNQ=";
|
||||
cargoPatches = [
|
||||
# Remove when new version of mdzk is released.
|
||||
./update-mdbook-for-rust-1.64.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
|
|
|||
246
pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch
Normal file
246
pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch
Normal file
|
|
@ -0,0 +1,246 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index ae63793..4068e02 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -162,12 +162,46 @@ dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
"bitflags",
|
||||
- "strsim",
|
||||
- "textwrap",
|
||||
+ "strsim 0.8.0",
|
||||
+ "textwrap 0.11.0",
|
||||
"unicode-width",
|
||||
"vec_map",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "clap"
|
||||
+version = "3.2.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "8e538f9ee5aa3b3963f09a997035f883677966ed50fce0292611927ce6f6d8c6"
|
||||
+dependencies = [
|
||||
+ "atty",
|
||||
+ "bitflags",
|
||||
+ "clap_lex",
|
||||
+ "indexmap",
|
||||
+ "lazy_static",
|
||||
+ "strsim 0.10.0",
|
||||
+ "termcolor",
|
||||
+ "textwrap 0.15.1",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "clap_complete"
|
||||
+version = "3.2.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
|
||||
+dependencies = [
|
||||
+ "clap 3.2.2",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "clap_lex"
|
||||
+version = "0.2.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
|
||||
+dependencies = [
|
||||
+ "os_str_bytes",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "cpufeatures"
|
||||
version = "0.2.1"
|
||||
@@ -222,9 +256,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
-version = "0.7.1"
|
||||
+version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
|
||||
+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"humantime",
|
||||
@@ -385,15 +419,6 @@ dependencies = [
|
||||
"version_check",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "getopts"
|
||||
-version = "0.2.21"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
|
||||
-dependencies = [
|
||||
- "unicode-width",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.16"
|
||||
@@ -471,7 +496,7 @@ dependencies = [
|
||||
"log",
|
||||
"pest",
|
||||
"pest_derive",
|
||||
- "quick-error 2.0.1",
|
||||
+ "quick-error",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
@@ -575,12 +600,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
|
||||
|
||||
[[package]]
|
||||
name = "humantime"
|
||||
-version = "1.3.0"
|
||||
+version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
|
||||
-dependencies = [
|
||||
- "quick-error 1.2.3",
|
||||
-]
|
||||
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
@@ -822,13 +844,14 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
|
||||
|
||||
[[package]]
|
||||
name = "mdbook"
|
||||
-version = "0.4.15"
|
||||
+version = "0.4.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6"
|
||||
+checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
- "clap",
|
||||
+ "clap 3.2.2",
|
||||
+ "clap_complete",
|
||||
"env_logger",
|
||||
"handlebars",
|
||||
"lazy_static",
|
||||
@@ -838,7 +861,6 @@ dependencies = [
|
||||
"pulldown-cmark",
|
||||
"regex",
|
||||
"serde",
|
||||
- "serde_derive",
|
||||
"serde_json",
|
||||
"shlex",
|
||||
"tempfile",
|
||||
@@ -1062,6 +1084,12 @@ dependencies = [
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "os_str_bytes"
|
||||
+version = "6.3.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
|
||||
+
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.11.2"
|
||||
@@ -1258,17 +1286,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
- "getopts",
|
||||
"memchr",
|
||||
"unicase",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "quick-error"
|
||||
-version = "1.2.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||
-
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "2.0.1"
|
||||
@@ -1386,9 +1407,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
-version = "1.5.4"
|
||||
+version = "1.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
|
||||
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -1403,9 +1424,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
-version = "0.6.25"
|
||||
+version = "0.6.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
||||
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
|
||||
|
||||
[[package]]
|
||||
name = "remove_dir_all"
|
||||
@@ -1577,13 +1598,19 @@ version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
|
||||
+[[package]]
|
||||
+name = "strsim"
|
||||
+version = "0.10.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||
+
|
||||
[[package]]
|
||||
name = "structopt"
|
||||
version = "0.3.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
|
||||
dependencies = [
|
||||
- "clap",
|
||||
+ "clap 2.33.3",
|
||||
"lazy_static",
|
||||
"structopt-derive",
|
||||
]
|
||||
@@ -1673,6 +1700,12 @@ dependencies = [
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "textwrap"
|
||||
+version = "0.15.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
|
||||
+
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.30"
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index dfeeb45..8b1e4e5 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -38,7 +38,7 @@ handlebars = "4.2.1"
|
||||
ignore = "0.4.18"
|
||||
lazy_static = "1.4.0"
|
||||
lazy-regex = "2.2.2"
|
||||
-mdbook = { version = "0.4.15", default-features = false }
|
||||
+mdbook = { version = "0.4.21", default-features = false }
|
||||
notify = "4.0.17"
|
||||
pest = "2.1.3"
|
||||
pest_derive = "2.1.0"
|
||||
diff --git a/src/renderer/mdzk_renderer.rs b/src/renderer/mdzk_renderer.rs
|
||||
index 55b2423..f8480ca 100644
|
||||
--- a/src/renderer/mdzk_renderer.rs
|
||||
+++ b/src/renderer/mdzk_renderer.rs
|
||||
@@ -92,7 +92,7 @@ impl Renderer for HtmlMdzk {
|
||||
"description",
|
||||
json!(ctx.config.book.description.clone().unwrap_or_default()),
|
||||
);
|
||||
- if let Some(ref livereload) = html_config.livereload_url {
|
||||
+ if let Some(ref livereload) = html_config.live_reload_endpoint {
|
||||
data.insert("livereload", json!(livereload));
|
||||
}
|
||||
data.insert("fold_enable", json!(html_config.fold.enable));
|
||||
|
|
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config automake autoconf ];
|
||||
buildInputs = [ gtk2 libXft intltool libtool ];
|
||||
nativeBuildInputs = [ pkg-config automake autoconf intltool ];
|
||||
buildInputs = [ gtk2 libXft libtool ];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
|
|
|
|||
|
|
@ -20,11 +20,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
intltool
|
||||
udev
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ];
|
||||
|
||||
buildInputs = [ glib intltool gtk3 gtksourceview ];
|
||||
buildInputs = [ glib gtk3 gtksourceview ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A sticky note application for jotting down things to remember";
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imake gccmakedep ];
|
||||
nativeBuildInputs = [ imake gccmakedep pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXt
|
||||
libXext
|
||||
libXpm
|
||||
] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ];
|
||||
] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ let
|
|||
|
||||
buildPhase = let
|
||||
buildCommand = target: ''
|
||||
ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}"
|
||||
ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}"
|
||||
(
|
||||
source chrome/installer/linux/common/installer.include
|
||||
PACKAGE=$packageName
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
buildInputs = [ luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = "fractal";
|
||||
rev = version;
|
||||
sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
|
||||
hash = "sha256-To6lr2I+JVrxvuK++2gLWntFGnEBm+B6KTRuOvjASek=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -40,14 +40,17 @@ stdenv.mkDerivation rec {
|
|||
# fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch";
|
||||
sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";
|
||||
hash = "sha256-3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";
|
||||
})
|
||||
|
||||
# This is in fractal v4.4.1b1+ so can be removed when fractal is updated.
|
||||
./update-socket2-for-rust-1.64.diff
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
inherit src patches;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
|
||||
hash = "sha256-d99zSaxp22YyLP3Wckgcm7wlz7nFrLJDHq2xPJmZFf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,195 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index c0b5e5e2..3009f183 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1,5 +1,7 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
+version = 3
|
||||
+
|
||||
[[package]]
|
||||
name = "addr2line"
|
||||
version = "0.13.0"
|
||||
@@ -169,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
|
||||
dependencies = [
|
||||
"addr2line",
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"libc",
|
||||
"miniz_oxide",
|
||||
"object",
|
||||
@@ -326,6 +328,12 @@ version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||
|
||||
+[[package]]
|
||||
+name = "cfg-if"
|
||||
+version = "1.0.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
+
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.13"
|
||||
@@ -407,7 +415,7 @@ version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -417,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
|
||||
dependencies = [
|
||||
"autocfg 1.0.0",
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
@@ -455,7 +463,7 @@ version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
@@ -465,7 +473,7 @@ version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
@@ -506,7 +514,7 @@ version = "0.8.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -549,7 +557,7 @@ version = "1.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"crc32fast",
|
||||
"libc",
|
||||
"miniz_oxide",
|
||||
@@ -842,7 +850,7 @@ version = "0.1.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
@@ -979,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
"futures-util",
|
||||
@@ -1543,7 +1551,7 @@ version = "0.4.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1648,7 +1656,7 @@ version = "0.6.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"fuchsia-zircon",
|
||||
"fuchsia-zircon-sys",
|
||||
"iovec",
|
||||
@@ -1703,7 +1711,7 @@ version = "0.2.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"libc",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
@@ -1826,7 +1834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"foreign-types",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
@@ -2523,13 +2531,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
-version = "0.3.12"
|
||||
+version = "0.3.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
|
||||
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 1.0.0",
|
||||
"libc",
|
||||
- "redox_syscall",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
@@ -2678,7 +2685,7 @@ version = "3.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"libc",
|
||||
"rand 0.7.3",
|
||||
"redox_syscall",
|
||||
@@ -2818,7 +2825,7 @@ version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"log",
|
||||
"tracing-core",
|
||||
]
|
||||
@@ -2998,7 +3005,7 @@ version = "0.2.67"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"wasm-bindgen-macro",
|
||||
@@ -3025,7 +3032,7 @@ version = "0.4.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
|
||||
dependencies = [
|
||||
- "cfg-if",
|
||||
+ "cfg-if 0.1.10",
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
|
|
@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
|
||||
|
||||
buildInputs = [ libotr pidgin intltool ];
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [ libotr pidgin ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://otr.cypherpunks.ca/";
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ glib intltool libappindicator-gtk2 libtool pidgin ];
|
||||
nativeBuildInputs = [ autoreconfHook intltool ];
|
||||
buildInputs = [ glib libappindicator-gtk2 libtool pidgin ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
|
||||
};
|
||||
|
||||
buildInputs = [ pidgin intltool python2 ];
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [ pidgin python2 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ let unwrapped = stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper intltool ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ let unwrapped = stdenv.mkDerivation rec {
|
|||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
libxml2 nss nspr
|
||||
libXScrnSaver python-with-dbus
|
||||
avahi dbus dbus-glib intltool libidn
|
||||
avahi dbus dbus-glib libidn
|
||||
libICE libXext libSM cyrus_sasl
|
||||
libgnt ncurses # optional: build finch - the console UI
|
||||
]
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ in
|
|||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "seahub";
|
||||
version = "9.0.6";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
|
|
@ -29,8 +30,6 @@ python.pkgs.buildPythonApplication rec {
|
|||
sha256 = "sha256-GHvJlm5DVt3IVJnqJu8YobNNqbjdPd08s4DCdQQRQds=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
doCheck = false; # disabled because it requires a ccnet environment
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
rsync
|
||||
lua pkg-config
|
||||
lua
|
||||
asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
|
|||
gettext
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -55,7 +56,6 @@ stdenv.mkDerivation rec {
|
|||
libofx
|
||||
libxml2
|
||||
libxslt
|
||||
pkg-config
|
||||
swig
|
||||
webkitgtk
|
||||
]
|
||||
|
|
|
|||
|
|
@ -19,12 +19,11 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
|
||||
buildInputs = [
|
||||
gtk
|
||||
libgsf
|
||||
libofx
|
||||
intltool
|
||||
libsoup
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
buildInputs = [ gtk libofx intltool libsoup gnome.adwaita-icon-theme ];
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
|
||||
buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free, easy, personal accounting for everyone";
|
||||
|
|
|
|||
|
|
@ -555,7 +555,6 @@ in
|
|||
openssl
|
||||
pam
|
||||
perl
|
||||
pkg-config
|
||||
poppler
|
||||
python3
|
||||
sane-backends
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
stdenv.mkDerivation {
|
||||
pname = "rtl-ais";
|
||||
version = "0.8.1";
|
||||
buildInputs = [ pkg-config rtl-sdr libusb1 ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ rtl-sdr libusb1 ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgiardini";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ mkDerivation rec {
|
|||
patches = [
|
||||
./remove-use-of-dlopen.patch
|
||||
];
|
||||
buildInputs = [ libpulseaudio alsa-lib pkg-config qtbase ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libpulseaudio alsa-lib qtbase ];
|
||||
CFLAGS ="-lasound -lpulse-simple";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
|
||||
buildInputs = [ glib pkg-config gtk2 hamlib ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib gtk2 hamlib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An amateur radio logging program";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx";
|
||||
};
|
||||
|
||||
buildInputs = [ autoreconfHook pkg-config zlib perl ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ zlib perl ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project";
|
||||
|
|
|
|||
|
|
@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
patches = [ ./struct.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [libglade gtk2 guile libxml2
|
||||
perl intltool libtool pkg-config];
|
||||
perl libtool ];
|
||||
|
||||
prebuild = ''
|
||||
cp drgeo.desktop.in drgeo.desktop
|
||||
|
|
|
|||
|
|
@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontUseImakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
|
||||
pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu
|
||||
pkg-config bison imake which blas lapack curl tcl tk jdk
|
||||
bison imake which blas lapack curl tcl tk jdk
|
||||
] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
# executable sage. No tests are run yet and no documentation is built.
|
||||
|
||||
let
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
pythonEnv # for patchShebangs
|
||||
pkg-config
|
||||
blas lapack
|
||||
singular
|
||||
three
|
||||
|
|
@ -72,7 +72,7 @@ let
|
|||
[]
|
||||
);
|
||||
|
||||
allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]);
|
||||
allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]);
|
||||
transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs ));
|
||||
# fix differences between spkg and sage names
|
||||
# (could patch sage instead, but this is more lightweight and also works for packages depending on sage)
|
||||
|
|
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "sage-with-env";
|
||||
src = sage-env.lib.src;
|
||||
|
||||
inherit buildInputs;
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
|
||||
configurePhase = "#do nothing";
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype which ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-x"
|
||||
|
|
|
|||
|
|
@ -44,9 +44,10 @@ stdenv.mkDerivation {
|
|||
sha256 = "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs =
|
||||
[ libX11 libXt libXft ncurses # required to build the terminfo file
|
||||
fontconfig freetype pkg-config libXrender
|
||||
fontconfig freetype libXrender
|
||||
libptytty
|
||||
] ++ optional perlSupport perl
|
||||
++ optional gdkPixbufSupport gdk-pixbuf;
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
|
||||
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ]
|
||||
++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
|
||||
docbook_xsl docbook_xml_dtd_45 libxslt ];
|
||||
buildInputs = [ curl openssl zlib expat cpio libiconv bash ]
|
||||
|
|
@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optionals guiSupport [tcl tk]
|
||||
++ lib.optionals withpcre2 [ pcre2 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security CoreServices ]
|
||||
++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
|
||||
++ lib.optionals withLibsecret [ glib libsecret ];
|
||||
|
||||
# required to support pthread_cancel()
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
|
||||
|
|
@ -252,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'')
|
||||
|
||||
+ lib.optionalString withManual ''# Install man pages
|
||||
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \
|
||||
make -j $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \
|
||||
-C Documentation ''
|
||||
|
||||
+ (if guiSupport then ''
|
||||
|
|
|
|||
|
|
@ -34,12 +34,11 @@ stdenv.mkDerivation {
|
|||
"-Wno-error=incompatible-pointer-types"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [
|
||||
which
|
||||
gnome.gnome-common
|
||||
glib
|
||||
intltool
|
||||
libtool
|
||||
cairo
|
||||
gtk3
|
||||
|
|
|
|||
|
|
@ -66,9 +66,9 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
hardeningDisable = [ "stackprotector" "fortify" "pic" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [
|
||||
cmake which
|
||||
which
|
||||
|
||||
# Xen
|
||||
bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio
|
||||
|
|
|
|||
|
|
@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
|
|||
url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2";
|
||||
sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs =
|
||||
[ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ];
|
||||
[ libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ];
|
||||
|
||||
preConfigure = "patchShebangs .";
|
||||
|
||||
|
|
|
|||
|
|
@ -122,6 +122,31 @@ fi
|
|||
|
||||
if [[ "$isCxx" = 1 ]]; then
|
||||
if [[ "$cxxInclude" = 1 ]]; then
|
||||
#
|
||||
# The motivation for this comment is to explain the reason for appending
|
||||
# the C++ stdlib to NIX_CFLAGS_COMPILE, which I initially thought should
|
||||
# change and later realized it shouldn't in:
|
||||
#
|
||||
# https://github.com/NixOS/nixpkgs/pull/185569#issuecomment-1234959249
|
||||
#
|
||||
# NIX_CFLAGS_COMPILE contains dependencies added using "-isystem", and
|
||||
# NIX_CXXSTDLIB_COMPILE adds the C++ stdlib using "-isystem". Appending
|
||||
# NIX_CXXSTDLIB_COMPILE to NIX_CLAGS_COMPILE emulates this part of the
|
||||
# include lookup order from GCC/Clang:
|
||||
#
|
||||
# > 4. Directories specified with -isystem options are scanned in
|
||||
# > left-to-right order.
|
||||
# > 5. Standard system directories are scanned.
|
||||
# > 6. Directories specified with -idirafter options are scanned
|
||||
# > in left-to-right order.
|
||||
#
|
||||
# NIX_CXX_STDLIB_COMPILE acts as the "standard system directories" that
|
||||
# are otherwise missing from CC in nixpkgs, so should be added last.
|
||||
#
|
||||
# This means that the C standard library should never be present inside
|
||||
# NIX_CFLAGS_COMPILE, because it MUST come after the C++ stdlib. It is
|
||||
# added automatically by cc-wrapper later using "-idirafter".
|
||||
#
|
||||
NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@"
|
||||
fi
|
||||
if [[ "$cxxLibrary" = 1 ]]; then
|
||||
|
|
|
|||
|
|
@ -124,7 +124,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
|
|||
];
|
||||
|
||||
buildInputs = buildInputs
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]
|
||||
++ lib.optionals stdenv.hostPlatform.isMinGW [ windows.pthreads ];
|
||||
|
||||
patches = cargoPatches ++ patches;
|
||||
|
|
|
|||
|
|
@ -7,23 +7,23 @@ cargoSetupPostUnpackHook() {
|
|||
# this for us automatically.
|
||||
if [ -z $cargoVendorDir ]; then
|
||||
unpackFile "$cargoDeps"
|
||||
export cargoDepsCopy=$(stripHash $cargoDeps)
|
||||
export cargoDepsCopy="$(realpath "$(stripHash $cargoDeps)")"
|
||||
else
|
||||
cargoDepsCopy="$sourceRoot/${cargoRoot:+$cargoRoot/}${cargoVendorDir}"
|
||||
cargoDepsCopy="$(realpath "$(pwd)/$sourceRoot/${cargoRoot:+$cargoRoot/}${cargoVendorDir}")"
|
||||
fi
|
||||
|
||||
if [ ! -d .cargo ]; then
|
||||
mkdir .cargo
|
||||
fi
|
||||
|
||||
config="$(pwd)/$cargoDepsCopy/.cargo/config";
|
||||
config="$cargoDepsCopy/.cargo/config";
|
||||
if [[ ! -e $config ]]; then
|
||||
config=@defaultConfig@
|
||||
fi;
|
||||
|
||||
tmp_config=$(mktemp)
|
||||
substitute $config $tmp_config \
|
||||
--subst-var-by vendor "$(pwd)/$cargoDepsCopy"
|
||||
--subst-var-by vendor "$cargoDepsCopy"
|
||||
cat ${tmp_config} >> .cargo/config
|
||||
|
||||
cat >> .cargo/config <<'EOF'
|
||||
|
|
@ -39,8 +39,8 @@ EOF
|
|||
cargoSetupPostPatchHook() {
|
||||
echo "Executing cargoSetupPostPatchHook"
|
||||
|
||||
cargoDepsLockfile="$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock"
|
||||
srcLockfile="$NIX_BUILD_TOP/$sourceRoot/${cargoRoot:+$cargoRoot/}/Cargo.lock"
|
||||
cargoDepsLockfile="$cargoDepsCopy/Cargo.lock"
|
||||
srcLockfile="$(pwd)/${cargoRoot:+$cargoRoot/}Cargo.lock"
|
||||
|
||||
echo "Validating consistency between $srcLockfile and $cargoDepsLockfile"
|
||||
if ! @diff@ $srcLockfile $cargoDepsLockfile; then
|
||||
|
|
|
|||
|
|
@ -16,12 +16,14 @@ makeSetupHook {
|
|||
|
||||
substitutions = {
|
||||
cc = "${cc}/bin/${cc.targetPrefix}cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
# Extract the function call used to create a binary wrapper from its embedded docstring
|
||||
passthru.extractCmd = writeShellScript "extract-binary-wrapper-cmd" ''
|
||||
extractCmd = writeShellScript "extract-binary-wrapper-cmd" ''
|
||||
strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p'
|
||||
'';
|
||||
|
||||
passthru.tests = tests.makeBinaryWrapper;
|
||||
tests = tests.makeBinaryWrapper;
|
||||
};
|
||||
} ./make-binary-wrapper.sh
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ callPackage, makeSetupHook }:
|
||||
|
||||
(makeSetupHook {
|
||||
makeSetupHook {
|
||||
name = "postgresql-test-hook";
|
||||
} ./postgresql-test-hook.sh).overrideAttrs (o: {
|
||||
passthru.tests = {
|
||||
simple = callPackage ./test.nix { };
|
||||
};
|
||||
})
|
||||
} ./postgresql-test-hook.sh
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
}:
|
||||
|
||||
makeSetupHook {
|
||||
name = "wrap-gapps-hook";
|
||||
deps = lib.optionals (!stdenv.isDarwin) [
|
||||
# It is highly probable that a program will use GSettings,
|
||||
# at minimum through GTK file chooser dialogue.
|
||||
|
|
@ -36,8 +37,8 @@ makeSetupHook {
|
|||
# We use the wrapProgram function.
|
||||
makeWrapper
|
||||
];
|
||||
substitutions = {
|
||||
passthru.tests = let
|
||||
passthru = {
|
||||
tests = let
|
||||
sample-project = ./tests/sample-project;
|
||||
|
||||
testLib = callPackage ./tests/lib.nix { };
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
optionalAttrs
|
||||
warn
|
||||
;
|
||||
in
|
||||
|
||||
rec {
|
||||
|
||||
/* Run the shell command `buildCommand' to produce a store path named
|
||||
|
|
@ -525,12 +532,25 @@ rec {
|
|||
* substitutions = { bash = "${pkgs.bash}/bin/bash"; };
|
||||
* meta.platforms = lib.platforms.linux;
|
||||
* } ./myscript.sh;
|
||||
*
|
||||
* # setup hook with a package test
|
||||
* myhellohookTested = makeSetupHook {
|
||||
* deps = [ hello ];
|
||||
* substitutions = { bash = "${pkgs.bash}/bin/bash"; };
|
||||
* meta.platforms = lib.platforms.linux;
|
||||
* passthru.tests.greeting = callPackage ./test { };
|
||||
* } ./myscript.sh;
|
||||
*/
|
||||
makeSetupHook = { name ? "hook", deps ? [], substitutions ? {}, meta ? {} }: script:
|
||||
makeSetupHook = { name ? "hook", deps ? [], substitutions ? {}, meta ? {}, passthru ? {} }: script:
|
||||
runCommand name
|
||||
(substitutions // {
|
||||
inherit meta;
|
||||
strictDeps = true;
|
||||
# TODO 2023-01, no backport: simplify to inherit passthru;
|
||||
passthru = passthru
|
||||
// optionalAttrs (substitutions?passthru)
|
||||
(warn "makeSetupHook (name = ${lib.strings.escapeNixString name}): `substitutions.passthru` is deprecated. Please set `passthru` directly."
|
||||
substitutions.passthru);
|
||||
})
|
||||
(''
|
||||
mkdir -p $out/nix-support
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./rsvg-convert.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool iconnamingutils imagemagick librsvg ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ iconnamingutils imagemagick librsvg ];
|
||||
propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ];
|
||||
# still missing parent icon themes: cristalsvg
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ let
|
|||
blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist);
|
||||
extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings);
|
||||
|
||||
srcVersion = "3.80";
|
||||
srcVersion = "3.83";
|
||||
version = if nssOverride != null then nssOverride.version else srcVersion;
|
||||
meta = with lib; {
|
||||
homepage = "https://curl.haxx.se/docs/caextract.html";
|
||||
|
|
@ -35,7 +35,7 @@ let
|
|||
|
||||
src = if nssOverride != null then nssOverride.src else fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz";
|
||||
sha256 = "sha256-wL8f0sfimmsCswliK6r8RD7skMiTS7FV2ku5iYh4S2o=";
|
||||
sha256 = "sha256-qyPqZ/lkCQuLc8gKZ0CCVxw25fTrqSBXrGSMnB3vASg=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -21,11 +21,10 @@ stdenv.mkDerivation rec {
|
|||
./autogen.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
nativeBuildInputs = [ autoconf automake intltool ];
|
||||
buildInputs =
|
||||
[
|
||||
libtool
|
||||
intltool
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,10 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iana-etc";
|
||||
version = "20220520";
|
||||
version = "20220915";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
|
||||
sha256 = "sha256-LSrfNb4fUJEGSPJ+StlAbTE9LbOPDrRJLKTDSkuyoZQ=";
|
||||
sha256 = "sha256-gBaM5YEK2XA42S7ELwjQChie/wYgo6n8dt2WEg3Pdns=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,31 +1,28 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, python3, udev, systemd }:
|
||||
|
||||
let
|
||||
name = "media-player-info-24";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "media-player-info";
|
||||
version = "24";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/media-player-info/${pname}-${version}.tar.gz";
|
||||
sha256 = "0d0i7av8v369hzvlynwlrbickv1brlzsmiky80lrjgjh1gdldkz6";
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz";
|
||||
sha256 = "0d0i7av8v369hzvlynwlrbickv1brlzsmiky80lrjgjh1gdldkz6";
|
||||
};
|
||||
buildInputs = [ udev systemd ];
|
||||
nativeBuildInputs = [ pkg-config python3 ];
|
||||
|
||||
buildInputs = [ udev systemd ];
|
||||
nativeBuildInputs = [ pkg-config python3 ];
|
||||
postPatch = ''
|
||||
patchShebangs ./tools
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./tools
|
||||
'';
|
||||
configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ];
|
||||
|
||||
configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A repository of data files describing media player capabilities";
|
||||
homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
meta = with lib; {
|
||||
description = "A repository of data files describing media player capabilities";
|
||||
homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tzdata";
|
||||
version = "2022c";
|
||||
version = "2022d";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
|
||||
hash = "sha256-aXT040i/IyMnS1bf+edQAkfjFZ6qS0hd+gzWbnXBS/4=";
|
||||
hash = "sha256-bs2+4n+kPc+knz1P2Lsd/vVMkNoavNgsmrzy3E8yHeA=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
|
||||
hash = "sha256-Pnzh82IMwEgZB8fgdNaZEHkyhb/+DKMx7xptGuPqkMw=";
|
||||
hash = "sha256-1kS6D5OImTdOqMtVTjX7SvoPe9e3FsYXd80AUAuHWeA=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
|
|||
libXdamage
|
||||
muffin
|
||||
networkmanager
|
||||
pkg-config
|
||||
polkit
|
||||
libxml2
|
||||
libgnomekbd
|
||||
|
|
@ -134,6 +133,7 @@ stdenv.mkDerivation rec {
|
|||
gtk-doc
|
||||
perl
|
||||
python3.pkgs.wrapPython
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# use locales from cinnamon-translations (not using --localedir because datadir is used)
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config intltool ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ];
|
||||
buildInputs = [
|
||||
atk cairo glib gtk2
|
||||
pango libxml2Python perl intltool
|
||||
pango libxml2Python perl
|
||||
gettext
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
autoreconfHook gnome-common gtk-mac-integration-gtk2
|
||||
gnome-common gtk-mac-integration-gtk2
|
||||
];
|
||||
|
||||
preConfigure = optionalString stdenv.isDarwin ''
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool enchant isocodes autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook intltool ];
|
||||
buildInputs = [ enchant isocodes ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
|
|||
#http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html
|
||||
patches = [ ./01_remove-disable-deprecated.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk2 GConf enchant isocodes gnome-icon-theme ];
|
||||
|
||||
NIX_LDFLAGS = "-lgthread-2.0";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ popt zlib GConf gnome_vfs libcanberra-gtk2 libtool ];
|
||||
propagatedBuildInputs = [ glib libbonobo libogg ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./glib.patch ./cups_1.6.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 gettext intltool libart_lgpl ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk2 gettext libart_lgpl ];
|
||||
|
||||
propagatedBuildInputs = [ libxml2 ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk2 gettext libart_lgpl libgnomecups bison flex ];
|
||||
|
||||
propagatedBuildInputs = [ libxml2 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme];
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk2 gettext libgnomecanvas libgnomeprint gnome-icon-theme];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
|
|||
updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; };
|
||||
};
|
||||
|
||||
buildInputs = [ intltool itstool libxml2 ];
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [ itstool libxml2 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/GNOME/gnome-devel-docs";
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
|
|||
updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; };
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk3 intltool gnome.adwaita-icon-theme
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gtk3 gnome.adwaita-icon-theme
|
||||
gsettings-desktop-schemas ];
|
||||
|
||||
propagatedBuildInputs = [ enchant isocodes ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
|
||||
};
|
||||
|
||||
buildInputs = [ intltool ];
|
||||
nativeBuildInputs = [ intltool ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://lxde.org/";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue