diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/libdvdnav | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libdvdnav')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libdvdnav/default.nix | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix index c8ebf180b315..1f832de5bb3b 100644 --- a/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libdvdread}: +{lib, stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation { name = "libdvdnav-4.2.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; configureScript = "./configure2"; # wtf? @@ -20,9 +20,9 @@ stdenv.mkDerivation { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.linux; }; passthru = { inherit libdvdread; }; diff --git a/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix index 2afc11c60095..3eb1032b2a79 100644 --- a/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libdvdread}: +{lib, stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation rec { pname = "libdvdnav"; @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.unix; }; passthru = { inherit libdvdread; }; |