Unverified Commit 6fe5baa9 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

various: remove by-name overrides (part 3) (#483690)

parents 96b20a8a b19e2691
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
  lib,
  autoreconfHook,
  fetchFromGitHub,
  fltk,
  fltk_1_3,
  libjpeg,
  libpng,
  libwebp,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    autoreconfHook
    pkg-config
    fltk
    fltk_1_3
    which
  ];

@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
    libpng
    libwebp
    ssl
    fltk
    fltk_1_3
  ];

  outputs = [
+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
  nativefiledialog-extended,
  nlohmann_json,
  opencolorio,
  openexr,
  openexr_2,
  openssl,
  opentimelineio,
  plutovg,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
    nativefiledialog-extended
    nlohmann_json
    opencolorio
    openexr
    openexr_2
    openssl
    opentimelineio
    plutovg
+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
  wayland,
  wayland-protocols,
  wayland-scanner,
  wlroots,
  wlroots_0_18,
  writeText,
  xcbutilwm,
  xwayland,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
    pixman
    wayland
    wayland-protocols
    wlroots
    wlroots_0_18
  ]
  ++ lib.optionals enableXWayland [
    libX11
+2 −2
Original line number Diff line number Diff line
{
  lib,
  fetchFromGitHub,
  ocamlPackages,
  ocaml-ng,
}:

let
  inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir;
  inherit (ocaml-ng.ocamlPackages_5_2) buildDunePackage js_of_ocaml menhir;
in

buildDunePackage rec {
+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
  gperf,
  kmod,
  pkg-config,
  util-linux,
  util-linuxMinimal,
  testers,
}:

@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    kmod
    util-linux
    util-linuxMinimal
  ];

  configureFlags = [
Loading