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/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 0fbaca219de3..be7509d4cfbf 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -78,7 +78,7 @@ , libGLU , libGL , libintl -, libgme +, game-music-emu , openssl , x265 , libxml2 @@ -164,7 +164,7 @@ stdenv.mkDerivation rec { gnutls libGL libGLU - libgme + game-music-emu openssl libxml2 libintl diff --git a/pkgs/games/srb2/default.nix b/pkgs/games/srb2/default.nix index 1a4862904abe..57488bdb8b16 100644 --- a/pkgs/games/srb2/default.nix +++ b/pkgs/games/srb2/default.nix @@ -8,7 +8,7 @@ , nasm , libopenmpt , p7zip -, libgme +, game-music-emu , libpng , SDL2 , SDL2_mixer @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { buildInputs = [ curl - libgme + game-music-emu libpng libopenmpt SDL2 @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DSRB2_ASSET_DIRECTORY=/build/source/assets" - "-DGME_INCLUDE_DIR=${libgme}/include" + "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include" "-DSDL2_MIXER_INCLUDE_DIR=${SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${SDL2.dev}/include/SDL2" diff --git a/pkgs/games/srb2kart/default.nix b/pkgs/games/srb2kart/default.nix index 62f2915098de..e5a29aa56549 100644 --- a/pkgs/games/srb2kart/default.nix +++ b/pkgs/games/srb2kart/default.nix @@ -7,7 +7,7 @@ , curl , nasm , unzip -, libgme +, game-music-emu , libpng , SDL2 , SDL2_mixer @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { buildInputs = [ curl - libgme + game-music-emu libpng SDL2 SDL2_mixer @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ #"-DSRB2_ASSET_DIRECTORY=/build/source/assets" - "-DGME_INCLUDE_DIR=${libgme}/include" + "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DSDL2_MIXER_INCLUDE_DIR=${SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${SDL2.dev}/include/SDL2" ]; diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 58aa6daeeceb..436a8738b5b1 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchhg, cmake, pkg-config, makeWrapper, callPackage -, soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, libgme +, soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, game-music-emu , serverOnly ? false }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { # I have no idea why would SDL and libjpeg be needed for the server part! # But they are. - buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite libgme ] + buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite game-music-emu ] ++ lib.optionals (!serverOnly) [ libGL glew fmod fluidsynth gtk2 ]; nativeBuildInputs = [ cmake pkg-config makeWrapper python3 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 204846ca09fe..0550b736e968 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -717,6 +717,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 cb5f43b1512e..9c9f080bb5ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21151,8 +21151,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 { };