Unverified Commit 96e3394f authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

doublecmd: refactor inherit statement (#425437)

parents bb160f87 d9276ebd

pkgs/by-name/do/doublecmd/package.nix

+3 −4
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ 
  glib,

  lazarus,

  libX11,

  libqtpas,

  wrapQtAppsHook,

  libsForQt5,

  writableTmpDirAsHomeHook,

}:
@@ -28,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { 
    fpc

    getopt

    lazarus

    wrapQtAppsHook

    libsForQt5.wrapQtAppsHook

    writableTmpDirAsHomeHook

  ];
@@ -36,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { 
    dbus

    glib

    libX11

    libqtpas

    libsForQt5.libqtpas

  ];



  env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}";

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -1457,10 +1457,6 @@ with pkgs; 


  ### APPLICATIONS/FILE-MANAGERS



  doublecmd = callPackage ../by-name/do/doublecmd/package.nix {

    inherit (libsForQt5) libqtpas wrapQtAppsHook;

  };



  vifm-full = vifm.override {

    mediaSupport = true;

    inherit lib udisks2 python3;