cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libgme: remove

Browse source 
This was a duplicate package, we already had it under the name
game-music-emu. This commit merges the stdenv reference fix that was
present in libgme into game-music-emu as well.
This commit is contained in:
Linus Heckemann 2022-07-20 16:16:52 +02:00
parent e4d49de45a
commit bbd78d6030
4 changed files with 12 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/audio/game-music-emu/default.nix
View file

@ -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 ];
};
}

34
pkgs/development/libraries/audio/libgme/default.nix
View file

@ -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)"
'';
}

1
pkgs/top-level/aliases.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };