From fac100d6fce32a10bc20092259598793c16a518b Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 17 Jan 2026 06:43:10 +0100 Subject: [PATCH] libdvdnav{,_4_2_1}: move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/li/libdvdnav/package.nix} | 0 .../4.2.1.nix => by-name/li/libdvdnav_4_2_1/package.nix} | 6 ++++-- pkgs/top-level/all-packages.nix | 5 ----- 3 files changed, 4 insertions(+), 7 deletions(-) rename pkgs/{development/libraries/libdvdnav/default.nix => by-name/li/libdvdnav/package.nix} (100%) rename pkgs/{development/libraries/libdvdnav/4.2.1.nix => by-name/li/libdvdnav_4_2_1/package.nix} (96%) diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/by-name/li/libdvdnav/package.nix similarity index 100% rename from pkgs/development/libraries/libdvdnav/default.nix rename to pkgs/by-name/li/libdvdnav/package.nix diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/by-name/li/libdvdnav_4_2_1/package.nix similarity index 96% rename from pkgs/development/libraries/libdvdnav/4.2.1.nix rename to pkgs/by-name/li/libdvdnav_4_2_1/package.nix index 6b72938f7811..2af5f90057a8 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/by-name/li/libdvdnav_4_2_1/package.nix @@ -3,9 +3,11 @@ stdenv, fetchurl, pkg-config, - libdvdread, + libdvdread_4_9_9, }: - +let + libdvdread = libdvdread_4_9_9; +in stdenv.mkDerivation rec { pname = "libdvdnav"; version = "4.2.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b846dff7d42..7baf6687d940 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7143,11 +7143,6 @@ with pkgs; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; - libdvdnav = callPackage ../development/libraries/libdvdnav { }; - libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix { - libdvdread = libdvdread_4_9_9; - }; - libdvdread = callPackage ../development/libraries/libdvdread { }; libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };