Unverified Commit 17b4b1b7 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

various: remove by-name overrides (part 1) (#483681)

parents 6ba71cbc 94fc0097

pkgs/by-name/sw/sway-unwrapped/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
  libinput,

  gdk-pixbuf,

  librsvg,

  wlroots,

  wlroots_0_19,

  wayland-protocols,

  libdrm,

  nixosTests,
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { 
    librsvg

    wayland-protocols

    libdrm

    (wlroots.override { inherit (finalAttrs) enableXWayland; })

    (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; })

  ]

  ++ lib.optionals finalAttrs.enableXWayland [

    xorg.xcbutilwm

pkgs/by-name/th/the-powder-toy/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  lib,

  libpng,

  libX11,

  lua,

  lua5_2,

  luajit,

  meson,

  ninja,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 
    jsoncpp

    libpng

    libX11

    lua

    lua5_2

    luajit

    SDL2

    zlib

pkgs/by-name/to/tomb/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  lsof,

  makeBinaryWrapper,

  nix-update-script,

  pinentry,

  pinentry-curses,

  stdenvNoCC,

  util-linuxMinimal,

  versionCheckHook,
@@ -36,7 +36,7 @@ let 
    gnupg

    libargon2

    lsof

    pinentry

    pinentry-curses

    util-linuxMinimal

  ];
@@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [ makeBinaryWrapper ];



  buildInputs = [

    pinentry

    pinentry-curses

    zsh

  ];

pkgs/by-name/vc/vcsh/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  stdenv,

  fetchurl,

  autoconf,

  automake,

  automake116x,

  makeWrapper,

  pkg-config,

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


  nativeBuildInputs = [

    autoconf

    automake

    automake116x

    makeWrapper

    pkg-config

    unzip

pkgs/by-name/wa/waybox/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
  wayland,

  wayland-protocols,

  wayland-scanner,

  wlroots,

  wlroots_0_17,

}:



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

    wayland

    wayland-protocols

    wlroots

    wlroots_0_17

  ];



  strictDeps = true;