diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 55f12fd3c64a..b54bf789f6b2 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -9,13 +9,21 @@ stdenv.mkDerivation rec { sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake removeReferencesTo ]; + + # It used to reference it, in the past, but thanks to the postFixup hook, now + # it doesn't. + disallowedReferences = [ stdenv.cc.cc ]; + + postFixup = lib.optionalString stdenv.isLinux '' + remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" + ''; meta = with lib; { homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home"; description = "A collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; - maintainers = with maintainers; [ luc65r ]; + maintainers = with maintainers; [ luc65r lheckemann ]; }; } diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix deleted file mode 100644 index d78756b0ca45..000000000000 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: - -stdenv.mkDerivation rec { - pname = "libgme"; - version = "0.6.3"; - - meta = with lib; { - description = "A collection of video game music chip emulators"; - homepage = "https://bitbucket.org/mpyne/game-music-emu/overview"; - license = licenses.lgpl21; - platforms = platforms.all; - maintainers = with maintainers; [ lheckemann ]; - }; - - src = fetchFromBitbucket { - owner = "mpyne"; - repo = "game-music-emu"; - rev = version; - sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy"; - }; - - nativeBuildInputs = [ cmake removeReferencesTo ]; - - # These checks fail on aarch64-darwin - cmakeFlags = [ "-DENABLE_UBSAN=OFF" ]; - - # It used to reference it, in the past, but thanks to the postFixup hook, now - # it doesn't. - disallowedReferences = [ stdenv.cc.cc ]; - - postFixup = lib.optionalString stdenv.isLinux '' - remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" - ''; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c8f4cdde0daf..04e8bc0d6003 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -710,6 +710,7 @@ mapAliases ({ liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22 liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22 libgksu = throw "libgksu has been removed"; # Added 2022-01-16 + libgme = game-music-emu; # Added 2022-07-20 libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22 libgnome_keyring3 = throw "'libgnome_keyring3' has been renamed to/replaced by 'libgnome-keyring3'"; # Converted to throw 2022-02-22 libgpgerror = libgpg-error; # Added 2021-09-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c8af61fe2f2..c7669a61a9b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20751,8 +20751,6 @@ with pkgs; lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; - libgme = callPackage ../development/libraries/audio/libgme { }; - librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };