diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/by-name/bc/bcompare/package.nix similarity index 92% rename from pkgs/applications/version-management/bcompare/default.nix rename to pkgs/by-name/bc/bcompare/package.nix index fe357ff001c0..e0a0729bd9f8 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/by-name/bc/bcompare/package.nix @@ -8,10 +8,7 @@ glibc, pango, gtk2, - kcoreaddons, - ki18n, - kio, - kservice, + libsForQt5, stdenv, runtimeShell, unzip, @@ -25,7 +22,7 @@ let srcs = { x86_64-linux = fetchurl { - url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; + url = "https://www.scootersoftware.com/bcompare-${version}_amd64.deb"; sha256 = "sha256-4AWTSoYpVhGmBBxcwHXdg1CGd/04+8yL9pu+gHrsj6U"; }; @@ -59,7 +56,7 @@ let # Remove library that refuses to be autoPatchelf'ed rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so - substituteInPlace $out/bin/${pname} \ + substituteInPlace $out/bin/bcompare \ --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ --replace "ldd" "${glibc.bin}/bin/ldd" \ --replace "/bin/bash" "${runtimeShell}" @@ -75,10 +72,10 @@ let gtk2 pango cairo - kio - kservice - ki18n - kcoreaddons + libsForQt5.kio + libsForQt5.kservice + libsForQt5.ki18n + libsForQt5.kcoreaddons gdk-pixbuf bzip2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 354b53b7fb2a..b9c3acb8a819 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12486,8 +12486,6 @@ with pkgs; openbsd = callPackage ../os-specific/bsd/openbsd { }; - bcompare = libsForQt5.callPackage ../applications/version-management/bcompare { }; - xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver; radicle-node-unstable = callPackage ../by-name/ra/radicle-node/unstable.nix { };