Unverified Commit 7b1a07ed authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

various: remove by-name overrides (part 2) (#483689)

parents 82be19ed 8aa4d13f

pkgs/by-name/gu/guile-xcb/package.nix

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

  fetchFromGitHub,

  autoreconfHook,

  guile,

  guile_2_2,

  pkg-config,

  texinfo,

}:
@@ -24,13 +24,13 @@ stdenv.mkDerivation { 
    pkg-config

  ];

  buildInputs = [

    guile

    guile_2_2

    texinfo

  ];



  configureFlags = [

    "--with-guile-site-dir=$(out)/${guile.siteDir}"

    "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}"

    "--with-guile-site-dir=$(out)/${guile_2_2.siteDir}"

    "--with-guile-site-ccache-dir=$(out)/${guile_2_2.siteCcacheDir}"

  ];



  makeFlags = [
@@ -42,6 +42,6 @@ stdenv.mkDerivation { 
    description = "XCB bindings for Guile";

    license = lib.licenses.gpl3Plus;

    maintainers = [ ];

    platforms = guile.meta.platforms;

    platforms = guile_2_2.meta.platforms;

  };

}

pkgs/by-name/li/libkazv/package.nix

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

  immer,

  lager,

  libcpr,

  libcpr_1_10_5,

  libhttpserver,

  libmicrohttpd,

  nlohmann_json,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { 
    cryptopp

    immer

    lager

    libcpr

    libcpr_1_10_5

    libhttpserver

    libmicrohttpd

    olm

pkgs/by-name/ns/nsxiv/package.nix

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

  fetchFromGitea,

  giflib,

  imlib2,

  imlib2Full,

  libXft,

  libexif,

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


  buildInputs = [

    giflib

    imlib2

    imlib2Full

    libXft

    libexif

    libwebp

pkgs/by-name/pe/pekwm/package.nix

+6 −6
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  awk,

  gawk,

  cmake,

  grep,

  gnugrep,

  libXext,

  libXft,

  libXinerama,
@@ -14,7 +14,7 @@ 
  libpng,

  pkg-config,

  runtimeShell,

  sed,

  gnused,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: { 
  strictDeps = true;



  cmakeFlags = [

    "-DAWK=${lib.getBin awk}/bin/awk"

    "-DGREP=${lib.getBin grep}/bin/grep"

    "-DSED=${lib.getBin sed}/bin/sed"

    "-DAWK=${lib.getBin gawk}/bin/awk"

    "-DGREP=${lib.getBin gnugrep}/bin/grep"

    "-DSED=${lib.getBin gnused}/bin/sed"

    "-DSH=${runtimeShell}"

  ];

pkgs/by-name/re/renpy/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  libpng,

  makeWrapper,

  pkg-config,

  python3,

  python312,

  SDL2,

  stdenv,

  versionCheckHook,
@@ -21,7 +21,7 @@ 
}:



let

  python = python3;

  python = python312;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "renpy";