Unverified Commit 4cf29404 authored by Aliaksandr's avatar Aliaksandr Committed by Michael Daniels
Browse files

darktable: remove top-level override

parent e85ec3a4

pkgs/by-name/da/darktable/package.nix

+6 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
  libtiff,

  libwebp,

  libxml2,

  lua,

  lua5_4,

  util-linux,

  openexr,

  openjpeg,
@@ -78,7 +78,9 @@ 
  versionCheckHook,

  gitUpdater,

}:



let

  pugixml-shared = pugixml.override { shared = true; };

in

stdenv.mkDerivation rec {

  version = "5.4.0";

  pname = "darktable";
@@ -138,13 +140,13 @@ stdenv.mkDerivation rec { 
    libtiff

    libwebp

    libxml2

    lua

    lua5_4

    openexr

    openjpeg

    osm-gps-map

    pcre2

    portmidi

    pugixml

    pugixml-shared

    sqlite

  ]

  ++ lib.optionals stdenv.hostPlatform.isLinux [

pkgs/top-level/all-packages.nix

+0 −5
Original line number Diff line number Diff line
@@ -10059,11 +10059,6 @@ with pkgs; 
    haskell.lib.compose.justStaticExecutables haskellPackages.darcs

  );



  darktable = callPackage ../by-name/da/darktable/package.nix {

    lua = lua5_4;

    pugixml = pugixml.override { shared = true; };

  };



  datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix {

    pythonPackages = datadog-integrations-core { };

  };