diff --git a/pkgs/applications/science/math/lp_solve/0001-fix-cross-compilation.patch b/pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch similarity index 100% rename from pkgs/applications/science/math/lp_solve/0001-fix-cross-compilation.patch rename to pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/by-name/lp/lp_solve/package.nix similarity index 86% rename from pkgs/applications/science/math/lp_solve/default.nix rename to pkgs/by-name/lp/lp_solve/package.nix index 35bd657e7ad3..cadd82feb7f0 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/by-name/lp/lp_solve/package.nix @@ -4,19 +4,19 @@ fetchurl, cctools, fixDarwinDylibNames, - autoSignDarwinBinariesHook, + darwin, replaceVars, buildPackages, binutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lp_solve"; version = "5.5.2.11"; src = fetchurl { - url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; - sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; + url = "mirror://sourceforge/project/lpsolve/lpsolve/${finalAttrs.version}/lp_solve_${finalAttrs.version}_source.tar.gz"; + hash = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; }; nativeBuildInputs = @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ]; env = { @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdb04b486a72..efb60649de0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2376,10 +2376,6 @@ with pkgs; fluentd = callPackage ../tools/misc/fluentd { }; - lp_solve = callPackage ../applications/science/math/lp_solve { - inherit (darwin) autoSignDarwinBinariesHook; - }; - fpm = callPackage ../tools/package-management/fpm { }; ferdium = callPackage ../applications/networking/instant-messengers/ferdium {